Merge pull request #6198 from mgugino-upstream-stage/openvswitch-sys-container

Remove is_openvswitch_system_container from facts

playbooks/init/facts.yml

@@ -29,7 +29,6 @@
   - name: initialize_facts set fact for containerized and l_is_*_system_container
     set_fact:
       l_is_containerized: "{{ (l_is_atomic | bool) or (containerized | default(false) | bool) }}"
-      l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
       l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
 
   # TODO: Should this be moved into health checks??
@@ -113,7 +112,6 @@
         hostname: "{{ openshift_hostname | default(None) }}"
         ip: "{{ openshift_ip | default(None) }}"
         is_containerized: "{{ l_is_containerized | default(None) }}"
-        is_openvswitch_system_container: "{{ l_is_openvswitch_system_container | default(false) }}"
         is_master_system_container: "{{ l_is_master_system_container | default(false) }}"
         public_hostname: "{{ openshift_public_hostname | default(None) }}"
         public_ip: "{{ openshift_public_ip | default(None) }}"

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: ''
 

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