summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2018-01-17 14:05:30 -0500
committerMichael Gugino <mgugino@redhat.com>2018-01-17 14:08:36 -0500
commitfcbae1beea767791e2482b0a961ecfd2106ddcde (patch)
tree0402c7914bd880267c87f5226785ba6c4d4eb841 /roles
parentb58e8c1136725db9ce11d01e01e42575ee25ab44 (diff)
downloadopenshift-fcbae1beea767791e2482b0a961ecfd2106ddcde.tar.gz
openshift-fcbae1beea767791e2482b0a961ecfd2106ddcde.tar.bz2
openshift-fcbae1beea767791e2482b0a961ecfd2106ddcde.tar.xz
openshift-fcbae1beea767791e2482b0a961ecfd2106ddcde.zip
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.yml11
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