diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-22 02:12:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 02:12:46 -0400 |
| commit | 7db01fed21421ca9dbdcb1219b6da578db8bb96c (patch) | |
| tree | 6f9c96e1121f5caedd3d1d7b986001e28575f3c4 /roles | |
| parent | 84012fbbe8ad4b71c717803cd72178f8faecef1d (diff) | |
| parent | 7b829ec9c332577003af727210a6f34cf27eea83 (diff) | |
| download | openshift-7db01fed21421ca9dbdcb1219b6da578db8bb96c.tar.gz openshift-7db01fed21421ca9dbdcb1219b6da578db8bb96c.tar.bz2 openshift-7db01fed21421ca9dbdcb1219b6da578db8bb96c.tar.xz openshift-7db01fed21421ca9dbdcb1219b6da578db8bb96c.zip | |
Merge pull request #4510 from ashcrow/system-container-inventory
Merged by openshift-bot
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..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(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: "{{ (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: |