diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-18 14:56:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 14:56:30 -0800 |
| commit | 453027d9c7161b43d6529ba12a83b8d6fa459b72 (patch) | |
| tree | ba84d7f5b7c59ac413716604a23d43bb80febcf4 /roles | |
| parent | bccd1a8f97036febc0e9bf8666ec6b9a5f4ced65 (diff) | |
| parent | fcbae1beea767791e2482b0a961ecfd2106ddcde (diff) | |
| download | openshift-453027d9c7161b43d6529ba12a83b8d6fa459b72.tar.gz openshift-453027d9c7161b43d6529ba12a83b8d6fa459b72.tar.bz2 openshift-453027d9c7161b43d6529ba12a83b8d6fa459b72.tar.xz openshift-453027d9c7161b43d6529ba12a83b8d6fa459b72.zip | |
Merge pull request #6760 from mgugino-upstream-stage/fix-docker-atomic-proxies
Automatic merge from submit-queue.
Ensure atomic_proxies are configured with docker
In some setups, system containers may be used
in conjunction with package_docker.
This commit ensures that the atomic
proxies are configured while using package_docker
and containerized components.
This commit also ensures containerized_groups
are based on openshift_is_containerized instead
of 'containerized' variable directly to
account for possible use of atomic hosts which
users may not specify containerized in inventory
directly.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1535323
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/container_runtime/tasks/package_docker.yml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/roles/container_runtime/tasks/package_docker.yml b/roles/container_runtime/tasks/package_docker.yml index d6e7e7fed..ed9a2709b 100644 --- a/roles/container_runtime/tasks/package_docker.yml +++ b/roles/container_runtime/tasks/package_docker.yml @@ -1,6 +1,17 @@ --- - include_tasks: common/pre.yml +# In some cases, some services may be run as containers and docker may still +# be installed via rpm. +- include_tasks: common/atomic_proxy.yml + when: + - > + (openshift_use_system_containers | default(False)) | bool + or (openshift_use_etcd_system_container | default(False)) | bool + or (openshift_use_openvswitch_system_container | default(False)) | bool + or (openshift_use_node_system_container | default(False)) | bool + or (openshift_use_master_system_container | default(False)) | bool + - name: Get current installed Docker version command: "{{ repoquery_installed }} --qf '%{version}' docker" when: not openshift_is_atomic | bool |