Browse Source

system_containers: Add openshift_ to use_system_containers var

Steve Milner 7 years ago
parent
commit
37d85a23c3
2 changed files with 5 additions and 5 deletions
  1. 1 1
      roles/openshift_facts/defaults/main.yml
  2. 4 4
      roles/openshift_facts/tasks/main.yml

+ 1 - 1
roles/openshift_facts/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-use_system_containers: false
+openshift_use_system_containers: false

+ 4 - 4
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(use_system_containers) | bool) }}"
-    l_is_node_system_container: "{{ (use_node_system_container | default(use_system_containers) | bool) }}"
-    l_is_master_system_container: "{{ (use_master_system_container | default(use_system_containers) | bool) }}"
-    l_is_etcd_system_container: "{{ (use_etcd_system_container | default(use_system_containers) | 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) }}"
 - 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: