summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-06-20 11:19:16 -0400
committerSteve Milner <smilner@redhat.com>2017-06-20 11:19:16 -0400
commit75ced9124c696dd9ce8359ee1a165269883105b5 (patch)
treec6c84a1758effbb8ea03de574cdc3e44f624d1a0
parent37d85a23c3e188520395355d57a3f80576f96e05 (diff)
downloadopenshift-75ced9124c696dd9ce8359ee1a165269883105b5.tar.gz
openshift-75ced9124c696dd9ce8359ee1a165269883105b5.tar.bz2
openshift-75ced9124c696dd9ce8359ee1a165269883105b5.tar.xz
openshift-75ced9124c696dd9ce8359ee1a165269883105b5.zip
system_containers: Add openshift_ to other system_container vars
-rw-r--r--roles/openshift_facts/tasks/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index 040a8aed8..451386bf1 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -9,10 +9,10 @@
l_is_atomic: "{{ ostree_booted.stat.exists }}"
- set_fact:
l_is_containerized: "{{ (l_is_atomic | bool) or (containerized | default(false) | bool) }}"
- l_is_openvswitch_system_container: "{{ (use_openvswitch_system_container | default(openshift_use_system_containers) | bool) }}"
- l_is_node_system_container: "{{ (use_node_system_container | default(openshift_use_system_containers) | bool) }}"
- l_is_master_system_container: "{{ (use_master_system_container | default(openshift_use_system_containers) | bool) }}"
- l_is_etcd_system_container: "{{ (use_etcd_system_container | default(openshift_use_system_containers) | bool) }}"
+ l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_container | default(openshift_use_system_containers) | bool) }}"
+ l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers) | bool) }}"
+ l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers) | bool) }}"
+ l_is_etcd_system_container: "{{ (openshift_use_etcd_system_container | default(openshift_use_system_containers) | bool) }}"
- 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 }}"
- set_fact: