diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-20 18:31:20 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-21 12:58:20 -0500 |
| commit | 5c5793ae846196e268e9be7fd449912ef4a80dff (patch) | |
| tree | 37af476fe71ca2547f4213cd833ce78a3cf19db6 /playbooks | |
| parent | 6313f519307cf50055589c3876d8bec398bbc4d4 (diff) | |
| download | openshift-5c5793ae846196e268e9be7fd449912ef4a80dff.tar.gz openshift-5c5793ae846196e268e9be7fd449912ef4a80dff.tar.bz2 openshift-5c5793ae846196e268e9be7fd449912ef4a80dff.tar.xz openshift-5c5793ae846196e268e9be7fd449912ef4a80dff.zip | |
Fix logic for any sys containers
Remove set_fact in favor of the variables directly.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/init/facts.yml | 11 |
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: |