diff options
| author | Steve Milner <smilner@redhat.com> | 2017-06-20 11:17:28 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-06-20 11:17:28 -0400 |
| commit | 37d85a23c3e188520395355d57a3f80576f96e05 (patch) | |
| tree | 1819338885bfd43e6f51b71d7487673a936aa58c /roles | |
| parent | 0b0e0d1ec88af89f6315e1602b30ffe5218c88dc (diff) | |
| download | openshift-37d85a23c3e188520395355d57a3f80576f96e05.tar.gz openshift-37d85a23c3e188520395355d57a3f80576f96e05.tar.bz2 openshift-37d85a23c3e188520395355d57a3f80576f96e05.tar.xz openshift-37d85a23c3e188520395355d57a3f80576f96e05.zip | |
system_containers: Add openshift_ to use_system_containers var
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_facts/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_facts/defaults/main.yml b/roles/openshift_facts/defaults/main.yml index 28b388560..cc4dc9365 100644 --- a/roles/openshift_facts/defaults/main.yml +++ b/roles/openshift_facts/defaults/main.yml @@ -1,2 +1,2 @@ --- -use_system_containers: false +openshift_use_system_containers: false diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index 50ed3e964..040a8aed8 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(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: |