summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-11-20 18:05:13 -0500
committerMichael Gugino <mgugino@redhat.com>2017-11-22 13:49:06 -0500
commitd6a12ac03398ecc752139908688b82aa473c29ef (patch)
treefd46952f42a5db5933f5be8f7540a90a02017c21 /roles
parent71e090a7a301ffd5ccef6bb78a28bfae96130ce6 (diff)
downloadopenshift-d6a12ac03398ecc752139908688b82aa473c29ef.tar.gz
openshift-d6a12ac03398ecc752139908688b82aa473c29ef.tar.bz2
openshift-d6a12ac03398ecc752139908688b82aa473c29ef.tar.xz
openshift-d6a12ac03398ecc752139908688b82aa473c29ef.zip
Remove is_openvswitch_system_container from facts
Simply logic for this variable.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/defaults/main.yml1
-rw-r--r--roles/openshift_node/tasks/systemd_units.yml4
2 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index d249278dc..62208c155 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -14,6 +14,7 @@ system_images_registry_dict:
origin: "docker.io"
system_images_registry: "{{ system_images_registry_dict[openshift_deployment_type | default('origin')] }}"
+l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
openshift_image_tag: ''
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 9b4c24dfe..2344e33ca 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -25,7 +25,7 @@
include: openvswitch_system_container.yml
when:
- openshift_node_use_openshift_sdn | bool
- - openshift.common.is_openvswitch_system_container | bool
+ - l_is_openvswitch_system_container | bool
- block:
- name: Pre-pull openvswitch image
@@ -38,7 +38,7 @@
when:
- openshift.common.is_containerized | bool
- openshift_node_use_openshift_sdn | bool
- - not openshift.common.is_openvswitch_system_container | bool
+ - not l_is_openvswitch_system_container | bool
- include: config/configure-node-settings.yml
- include: config/configure-proxy-settings.yml