From fcbae1beea767791e2482b0a961ecfd2106ddcde Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Wed, 17 Jan 2018 14:05:30 -0500
Subject: 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
---
roles/container_runtime/tasks/package_docker.yml | 11 +++++++++++
1 file changed, 11 insertions(+)
(limited to 'roles/container_runtime/tasks')
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
--
cgit v1.2.3