summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6646 from giuseppe/fix-container-engine-authOpenShift Merge Robot2018-01-091-0/+6
|\ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. container-engine: move registry_auth.yml before pull so that the atomic pull takes into account the credentials if required. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * container-engine: move registry_auth.yml before pullGiuseppe Scrivano2018-01-081-0/+6
| | | | | | | | | | | | | | so that the atomic pull takes into account the credentials if required. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #6618 from ture-karlsson/masterScott Dodson2018-01-091-0/+4
|\ \ | | | | | | Provide example on how to use osm_etcd_image
| * | Provide example on how to use osm_etcd_image in a disconnected and ↵Ture Karlsson2018-01-051-0/+4
| | | | | | | | | | | | | | | containerized installation Example of how to use osm_etcd_image in accordance to: https://docs.openshift.com/container-platform/3.7/install_config/install/rpm_vs_containerized.html
* | | Merge pull request #6634 from vrutkovs/openshift_binary_for_upgradesScott Dodson2018-01-091-0/+2
|\ \ \ | | | | | | | | upgrades: set openshift_client_binary fact when running on oo_first_master host
| * | | upgrades: set openshift_client_binary fact when running on oo_first_master hostVadim Rutkovsky2018-01-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets openshift_client_binary var for the first master, as some roles use this var along with first_master_client_binary. Not sure if its worth setting this var for the faulty roles instead though. Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | Merge pull request #6650 from ↵OpenShift Merge Robot2018-01-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vrutkovs/containerized_upgrade_set_openshift_use_openshift_sdn Automatic merge from submit-queue. upgrades: use openshift_node_use_openshift_sdn when trying to pre-pull the image This affects 3.8/3.9 upgrades for containerized hosts, if nodes are separate from master.
| * | | | Use openshift_node_use_openshift_sdn when doing a containerized node upgradeVadim Rutkovsky2018-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | | Merge pull request #6659 from joelddiaz/ami_and_docker_storage_setupKenny Woodson2018-01-092-1/+6
|\ \ \ \ \ | | | | | | | | | | | | docker storage setup for ami building
| * | | | | docker storage setup for ami buildingJoel Diaz2018-01-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add host to g_new_node_hosts so that plays run against the AMI instance update example vars so that overlay2 is used by default for docker storage
* | | | | | Merge pull request #6660 from mgugino-upstream-stage/fix-logging-staticMichael Gugino2018-01-081-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix: change import_role to include_role
| * | | | | | Fix: change import_role to include_roleMichael Gugino2018-01-081-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that when one role dynamically imports another, usage of import_role inside the dynamically included role is not possible. If something is included with include_role (dynamic), all tasks therein must also use include_role (dynamic).
* | | | | | Merge pull request #6651 from mgugino-upstream-stage/containerized-groupsMichael Gugino2018-01-084-7/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Build containerized host group dynamically
| * | | | | | Build containerized host group dynamicallyMichael Gugino2018-01-084-7/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we are using some inventory variables to determine what host groups should be considered containerized. This is problematic and has several edge cases. This commit removes the variable l_containerized_host_groups and builds a dynamic group of hosts named 'oo_hosts_containerized_managed_true' based on the value of 'containerized'
* | | | | | Merge pull request #6653 from mgugino-upstream-stage/fix-crio-boolMichael Gugino2018-01-0810-15/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Properly cast crio boolean variables to bool
| * | | | | Properly cast crio boolean variables to boolMichael Gugino2018-01-0810-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variables that are specifically booleans should be cast to bool. This is because users may sometimes pass them as string values. This is particularly prevalent when using ini-style inventories. Affected-by: https://github.com/ansible/ansible/issues/34591 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1531592
* | | | | | 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
| | | | | | | |