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
---
 playbooks/container-runtime/private/build_container_groups.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'playbooks/container-runtime')

diff --git a/playbooks/container-runtime/private/build_container_groups.yml b/playbooks/container-runtime/private/build_container_groups.yml
index 7fd60743c..a2361d50c 100644
--- a/playbooks/container-runtime/private/build_container_groups.yml
+++ b/playbooks/container-runtime/private/build_container_groups.yml
@@ -3,4 +3,4 @@
   hosts: oo_all_hosts:!oo_nodes_to_config
   tasks:
   - group_by:
-      key: oo_hosts_containerized_managed_{{ (containerized | default(False)) | ternary('true','false') }}
+      key: oo_hosts_containerized_managed_{{ (openshift_is_containerized | default(False)) | ternary('true','false') }}
-- 
cgit v1.2.3