Fix node system container var

Fix logic, make it simpler.

playbooks/init/facts.yml

@@ -31,7 +31,6 @@
     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_node_system_container: "{{ (openshift_use_node_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) }}"
       l_is_etcd_system_container: "{{ (openshift_use_etcd_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
 
@@ -135,7 +134,6 @@
         ip: "{{ openshift_ip | default(None) }}"
         is_containerized: "{{ l_is_containerized | default(None) }}"
         is_openvswitch_system_container: "{{ l_is_openvswitch_system_container | default(false) }}"
-        is_node_system_container: "{{ l_is_node_system_container | default(false) }}"
         is_master_system_container: "{{ l_is_master_system_container | default(false) }}"
         is_etcd_system_container: "{{ l_is_etcd_system_container | default(false) }}"
         etcd_runtime: "{{ l_etcd_runtime }}"

roles/openshift_node/defaults/main.yml

@@ -4,6 +4,8 @@ openshift_node_debug_level: "{{ debug_level | default(2) }}"
 r_openshift_node_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
 r_openshift_node_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}"
 
+l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
+
 openshift_deployment_type: "{{ openshift_deployment_type | default('origin') }}"
 openshift_service_type: "{{ 'origin' if openshift_deployment_type == 'origin' else 'atomic-openshift' }}"
 

roles/openshift_node/tasks/install.yml

@@ -20,7 +20,7 @@
 
 - when:
   - openshift.common.is_containerized | bool
-  - not openshift.common.is_node_system_container | bool
+  - not l_is_node_system_container | bool
   block:
   - name: Pre-pull node image when containerized
     command: >

roles/openshift_node/tasks/systemd_units.yml

@@ -3,7 +3,7 @@
   template:
     dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service"
     src: "{{ openshift.common.is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}"
-  when: not openshift.common.is_node_system_container | bool
+  when: not l_is_node_system_container | bool
   notify:
   - reload systemd units
   - restart node
@@ -19,7 +19,7 @@
   - name: Install Node system container
     include: node_system_container.yml
     when:
-    - openshift.common.is_node_system_container | bool
+    - l_is_node_system_container | bool
 
   - name: Install OpenvSwitch system containers
     include: openvswitch_system_container.yml