summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ensure containerized bools are castMichael Gugino2018-01-084-4/+4
|
* Merge pull request #6580 from tomassedovic/openstack-fixesOpenShift Merge Robot2018-01-083-2/+10
|\ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Openstack fixes This includes a few fixes for the OpenStack provider. It should fix #6555 and possibly also #6560.
| * Import prerequisites.yml for OpenStackTomas Sedovic2018-01-021-0/+3
| |
| * Set the correct path to the openstack.conf fileTomas Sedovic2018-01-021-1/+1
| | | | | | | | | | The file exists in `/etc/origin/cloudprovider/openstack.conf` not `/etc/origin/openstack.conf`.
| * Return a openshift_node_labels as a dictTomas Sedovic2018-01-021-0/+5
| | | | | | | | | | | | | | | | The OpenStack dynamic inventory was setting the `openshift_node_labels` value as a string which causes a failure with the `lib_utils_oo_dict_to_keqv_list` filter. Fixes #6555
| * Fix yaml syntax error in the sample inventoryTomas Sedovic2018-01-021-2/+2
| |
* | Merge pull request #6649 from mgugino-upstream-stage/fix-pre-packagesMichael Gugino2018-01-081-2/+2
|\ \ | | | | | | install base_packages on oo_all_hosts
| * | install base_packages on oo_all_hostsMichael Gugino2018-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | This commit ensures base packages are installed for oo_all_hosts, which is what we were doing previously. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1530516
* | | Merge pull request #6549 from mgugino-upstream-stage/node-meta-depends2OpenShift Merge Robot2018-01-085-8/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove last of openshift_node role meta-depends Remove last non-taskless meta-depends from openshift_node role.
| * | | Remove last of openshift_node role meta-dependsMichael Gugino2018-01-025-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove last non-taskless meta-depends from openshift_node role. Remove variable 'openshift_node_upgrade_in_progress' as it is no longer used.
* | | | Merge pull request #6548 from kwoodson/configurable_ami_drive_sizeKenny Woodson2018-01-081-5/+1
|\ \ \ \ | | | | | | | | | | Adding ability to update ami drive size.
| * | | | Adding ability to update ami drive size.Kenny Woodson2017-12-211-5/+1
| |/ / /
* | | | Merge pull request #6624 from vrutkovs/containerized-avoid-replacing-node-unitOpenShift Merge Robot2018-01-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Don't overwrite node's systemd units for containerized install Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1527849 Perphaps this block should be removed, unless I'm missing some other case for it, as systemd units are being updated in ../systemd_units.yml.
| * | | | Don't overwrite node's systemd units for containerized installVadim Rutkovsky2018-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Systemd units are being updated in ../systemd_units.yml Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | | Merge pull request #6641 from sdodson/logging-loopsMichael Gugino2018-01-081-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Switch back to dynamic include_role in logging loops
| * | | | Switch back to dynamic include_role in logging loopsScott Dodson2018-01-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | We'd switched to import_role to avoid increased memory consumption but we must use include_role whenever we loop.
* | | | | Merge pull request #6587 from vrutkovs/test-coverageOpenShift Merge Robot2018-01-081-7/+344
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add more testcases for oc_scale module * Fixed docstrings for tests * Added tests to verify scale up/down, 'present' state, non-existant state and Replication Controller kind
| * | | | | test_oc_scale: add more scale test casesVadim Rutkovsky2018-01-021-0/+337
| | | | | |
| * | | | | test_oc_scale: fix test docstringsVadim Rutkovsky2018-01-021-7/+7
| | | | | |
* | | | | | Merge pull request #6507 from nbartos/continerOpenShift Merge Robot2018-01-0753-574/+914
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Contiv multi-master and other fixes Contiv's etcd was not being deployed correctly when using more than one master. To make it easier to manage, it has been moved into a k8s container. The api proxy was hardcoded to an old version (1.1.1), and in some environments would run into a docker error. This has been moved into a k8s container for easier management. The firewall was too permissive on several ports. Many were open to the world when they should have only been accessible inside the cluster. Many of the contiv role variables were not prefixed with 'contiv', which may end up clobbering variables from another role. Now all the contiv specific role variables start with 'contiv_'. The api proxy's default self-signed certificate was bundled with the role. This means someone with read-only MITM access and this key could decrypt traffic. Granted a user defined certificate from a trusted CA should be used in a production environment, it is still better to generate one in each environment when one is not provided.
| * | | | | | Use Contiv version 1.2.0Nick Bartos2018-01-086-8/+14
| | | | | | |
| * | | | | | Contiv multi-master and other fixesNick Bartos2018-01-0852-571/+905
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contiv's etcd was not being deployed correctly when using more than one master. To make it easier to manage, it has been moved into a k8s container. The api proxy was hardcoded to an old version (1.1.1), and in some environments would run into a docker error. This has been moved into a k8s container for easier management. The firewall was too permissive on several ports. Many were open to the world when they should have only been accessible inside the cluster. Many of the contiv role variables were not prefixed with 'contiv', which may end up clobbering variables from another role. Now all the contiv specific role variables start with 'contiv_'. The api proxy's default self-signed certificate was bundled with the role. This means someone with read-only MITM access and this key could decrypt traffic. Granted a user defined certificate from a trusted CA should be used in a production environment, it is still better to generate one in each environment when one is not provided.
* | | | | | | Merge pull request #6642 from mscherer/patch-1Scott Dodson2018-01-071-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix error in variable in comment
| * | | | | | Fix error in variable in commentMichael Scherer2018-01-081-1/+1
|/ / / / / /
* | | | | | Merge pull request #6637 from sdodson/missing-openshift-factsMichael Gugino2018-01-071-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add missing dependency on openshift_facts
| * | | | | Add missing dependency on openshift_factsScott Dodson2018-01-061-0/+1
| | | | | |
* | | | | | Merge pull request #6359 from spadgett/web-console-serverScott Dodson2018-01-0624-0/+426
|\ \ \ \ \ \ | | | | | | | | | | | | | | Install web console server
| * | | | | | Install web console serverSamuel Padgett2018-01-0524-0/+426
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6595 from mgugino-upstream-stage/fix-checks-varsOpenShift Merge Robot2018-01-050-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix docker_image_availability checks This commit ensures that oreg_url is properly templated by ansible before being consumed in the logic. This commit also adds a method to the base health check class to detect if self._templar is none, and return the appropriate templated/untemplated version of the variable. This is mostly for unit tests.
| * | | | | | Fix docker_image_availability checksMichael Gugino2018-01-032-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that oreg_url is properly templated by ansible before being consumed in the logic. This commit also adds a method to the base health check class to detect if self._templar is none, and return the appropriate templated/untemplated version of the variable. This is mostly for unit tests.
* | | | | | | Merge pull request #6597 from mgugino-upstream-stage/etc-remove-become-noOpenShift Merge Robot2018-01-057-54/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove become=no from etcd cert tasks etcd runs some actions locally to copy certs from the CA cert host. We shouldn't hard-code become behavior as it can be unexpected for the end user.
| * | | | | | | Remove become=no from various roles and tasksMichael Gugino2018-01-055-50/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | etcd runs some actions locally to copy certs from the CA cert host. This commit ensures that we respect the end user's intended behavior with become when using 'anisble_become' in the inventory. Other roles with similar tasks have been modified in the same manner. We shouldn't hard-code become behavior as it can be unexpected for the end user. This only currently works in the CI because the CI passes the '-b' argument on the command line, which will override the task behavior.
| * | | | | | | Fix docker_image_availability checksMichael Gugino2018-01-052-4/+13
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that oreg_url is properly templated by ansible before being consumed in the logic. This commit also adds a method to the base health check class to detect if self._templar is none, and return the appropriate templated/untemplated version of the variable. This is mostly for unit tests.
* | | | | | | Merge pull request #6511 from fabianvf/asb-origin-prefixScott Dodson2018-01-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add origin- prefix to ASB image
| * | | | | | | Add origin- prefix to ASB imageFabian von Feilitzsch2017-12-181-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #6627 from sdodson/import_roleScott Dodson2018-01-0576-152/+152
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | Migrate to import_role for static role inclusion
| * | | | | | | Migrate to import_role for static role inclusionScott Dodson2018-01-0576-152/+152
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ansible 2.2, the include_role directive came into existence as a Tech Preview. It is still a Tech Preview through Ansible 2.4 (and in current devel branch), but with a noteable change. The default behavior switched from static: true to static: false because that functionality moved to the newly introduced import_role directive (in order to stay consistent with include* being dynamic in nature and `import* being static in nature). The dynamic include is considerably more memory intensive as it will dynamically create a role import for every host in the inventory list to be used. (Also worth noting, there is at the time of this writing an object allocation inefficiency in the dynamic include that can in certain situations amplify this effect considerably) This change is meant to mitigate the pressure on memory for the Ansible control host. We need to evaluate where it makes sense to dynamically include roles and revert back to dynamic inclusion if and where it makes sense to do so.
* | | | | | | Merge pull request #6532 from jmencak/heat_stack-cnsOpenShift Merge Robot2018-01-055-1/+115
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. OpenStack provisioning -- support cns. Initial support for CNS nodes during OpenShift on OpenStack provisioning.
| * | | | | | | OpenStack provisioning -- support cns.Jiri Mencak2018-01-025-1/+115
| | | | | | | |
* | | | | | | | Merge pull request #6615 from giuseppe/cri-o-set-proxyOpenShift Merge Robot2018-01-052-0/+20
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. cri-o: set proxy variables Make CRI-O honor HTTP_PROXY/HTTPS_PROXY/NO_PROXY. This change https://github.com/kubernetes-incubator/cri-o/pull/1245 in the system container is required
| * | | | | | | crio: create /etc/sysconfig/crio-storageGiuseppe Scrivano2018-01-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | crio: configure proxy variablesGiuseppe Scrivano2018-01-052-0/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1529478 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.16.0].Jenkins CD Merge Bot2018-01-032-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #6596 from sdodson/masterScott Dodson2018-01-037-0/+152
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add gluster 3.9 templates
| * | | | | | Add gluster 3.9 templatesScott Dodson2018-01-037-0/+152
|/ / / / / /
* | | | | | Merge pull request #6539 from mgugino-upstream-stage/ci-in-treeScott Dodson2018-01-039-0/+160
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add in-tree CI scripts
| * | | | | | Add in-tree CI scriptsMichael Gugino2018-01-039-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the scripts that contain testing inventory and actually execute the running of openshift-ansible plays are kept in the CI jobs themselves. This commit adds scripts into our tree so we can have better control over variables, differences between branches, and more transparency to end users for how we run our integration tests.
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.15.0].Jenkins CD Merge Bot2018-01-032-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.14.0].Jenkins CD Merge Bot2018-01-032-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #6586 from ↵OpenShift Merge Robot2018-01-038-10/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/cast-bool-openshift_docker_use_system_container Automatic merge from submit-queue. Cast openshift_docker_use_system_container to bool openshift_docker_use_system_container might be passed in via ini inventory as 'openshift_docker_use_system_container=false' This condition will be interpreted as a string type, instead of boolean. Casting openshift_docker_use_system_container as bool will achieve the users desired intent. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1528943
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 17:03:45 +0000