summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-21 16:13:38 -0500
committerGitHub <noreply@github.com>2017-11-21 16:13:38 -0500
commit51a0cbd42807c91a5e30fa58362b8745a40607f2 (patch)
treef971033c4d6c5dade031c9a2ffc6988417f8319b
parent8d12df4b390832664f0be2d9955440bdeb00bb29 (diff)
parent5c5793ae846196e268e9be7fd449912ef4a80dff (diff)
downloadopenshift-51a0cbd42807c91a5e30fa58362b8745a40607f2.tar.gz
openshift-51a0cbd42807c91a5e30fa58362b8745a40607f2.tar.bz2
openshift-51a0cbd42807c91a5e30fa58362b8745a40607f2.tar.xz
openshift-51a0cbd42807c91a5e30fa58362b8745a40607f2.zip
Merge pull request #6202 from mgugino-upstream-stage/fix-any-sys-containers
Fix logic for any sys containers
-rw-r--r--playbooks/init/facts.yml11
1 files changed, 6 insertions, 5 deletions
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml
index 91223d368..2523afbf1 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -35,10 +35,6 @@
l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
l_is_etcd_system_container: "{{ (openshift_use_etcd_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
- - name: initialize_facts set facts for l_any_system_container
- set_fact:
- l_any_system_container: "{{ l_is_etcd_system_container or l_is_openvswitch_system_container or l_is_node_system_container or l_is_master_system_container }}"
-
- name: initialize_facts set fact for l_etcd_runtime
set_fact:
l_etcd_runtime: "{{ 'runc' if l_is_etcd_system_container else 'docker' if l_is_containerized else 'host' }}"
@@ -107,7 +103,12 @@
- ostree
- runc
when:
- - l_any_system_container | bool
+ - >
+ (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: Default system_images_registry to a enterprise registry
set_fact: