summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-27 09:52:11 -0500
committerGitHub <noreply@github.com>2017-11-27 09:52:11 -0500
commit05b13fa07f6913ba1afeae50c6647938033769a9 (patch)
tree0e01b166958f470fed5f028095a0e09eb3d653ee /roles
parent1ef463e727e202ba7595976f0478110b3b7585d0 (diff)
parentd6a12ac03398ecc752139908688b82aa473c29ef (diff)
downloadopenshift-05b13fa07f6913ba1afeae50c6647938033769a9.tar.gz
openshift-05b13fa07f6913ba1afeae50c6647938033769a9.tar.bz2
openshift-05b13fa07f6913ba1afeae50c6647938033769a9.tar.xz
openshift-05b13fa07f6913ba1afeae50c6647938033769a9.zip
Merge pull request #6198 from mgugino-upstream-stage/openvswitch-sys-container
Remove is_openvswitch_system_container from facts
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 6dd4838bd..397e1ba18 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -25,7 +25,7 @@
include_tasks: 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_tasks: config/configure-node-settings.yml
- include_tasks: config/configure-proxy-settings.yml