Remove openshift.common.{is_atomic|is_containerized}

We set these variables using facts in init, no need
to duplicate the logic all around the codebase.

17 files changed, 26 insertions, 26 deletions

diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml
index 62e0e1341..779916335 100644
--- a/roles/openshift_node/handlers/main.yml
+++ b/roles/openshift_node/handlers/main.yml
@@ -34,7 +34,7 @@
   pause: seconds=15
   when:
   - (not skip_node_svc_handlers | default(False) | bool)
-  - openshift.common.is_containerized | bool
+  - openshift_is_containerized | bool
 
 - name: restart node
   systemd:
diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml
index 8f38a47aa..1103fe4c9 100644
--- a/roles/openshift_node/tasks/config.yml
+++ b/roles/openshift_node/tasks/config.yml
@@ -4,7 +4,7 @@
 
 - name: Pull container images
   include_tasks: container_images.yml
-  when: openshift.common.is_containerized | bool
+  when: openshift_is_containerized | bool
 
 - name: Start and enable openvswitch service
   systemd:
@@ -13,7 +13,7 @@
     state: started
     daemon_reload: yes
   when:
-    - openshift.common.is_containerized | bool
+    - openshift_is_containerized | bool
     - openshift_node_use_openshift_sdn | default(true) | bool
   register: ovs_start_result
   until: not (ovs_start_result is failed)
@@ -58,7 +58,7 @@
 # restarted after the node restarts docker and it will take up to 60 seconds for
 # systemd to start the master again
 - when:
-    - openshift.common.is_containerized | bool
+    - openshift_is_containerized | bool
     - not openshift_node_bootstrap
   block:
     - name: Wait for master API to become available before proceeding
diff --git a/roles/openshift_node/tasks/dnsmasq_install.yml b/roles/openshift_node/tasks/dnsmasq_install.yml
index 0c8857b11..5e06ba032 100644
--- a/roles/openshift_node/tasks/dnsmasq_install.yml
+++ b/roles/openshift_node/tasks/dnsmasq_install.yml
@@ -12,7 +12,7 @@
 
 - name: Install dnsmasq
   package: name=dnsmasq state=installed
-  when: not openshift.common.is_atomic | bool
+  when: not openshift_is_atomic | bool
   register: result
   until: result is succeeded
 
diff --git a/roles/openshift_node/tasks/install.yml b/roles/openshift_node/tasks/install.yml
index fb98b7550..55738d759 100644
--- a/roles/openshift_node/tasks/install.yml
+++ b/roles/openshift_node/tasks/install.yml
@@ -1,5 +1,5 @@
 ---
-- when: not openshift.common.is_containerized | bool
+- when: not openshift_is_containerized | bool
   block:
   - name: Install Node package
     package:
@@ -25,7 +25,7 @@
     until: result is succeeded
 
 - when:
-  - openshift.common.is_containerized | bool
+  - openshift_is_containerized | bool
   - not l_is_node_system_container | bool
   block:
   - name: Pre-pull node image when containerized
diff --git a/roles/openshift_node/tasks/registry_auth.yml b/roles/openshift_node/tasks/registry_auth.yml
index ab43ec049..92650e6b7 100644
--- a/roles/openshift_node/tasks/registry_auth.yml
+++ b/roles/openshift_node/tasks/registry_auth.yml
@@ -41,7 +41,7 @@
   set_fact:
     l_bind_docker_reg_auth: True
   when:
-    - openshift.common.is_containerized | bool
+    - openshift_is_containerized | bool
     - oreg_auth_user is defined
     - >
         (node_oreg_auth_credentials_stat.stat.exists
diff --git a/roles/openshift_node/tasks/storage_plugins/ceph.yml b/roles/openshift_node/tasks/storage_plugins/ceph.yml
index 52d80357e..e30f58a9a 100644
--- a/roles/openshift_node/tasks/storage_plugins/ceph.yml
+++ b/roles/openshift_node/tasks/storage_plugins/ceph.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install Ceph storage plugin dependencies
   package: name=ceph-common state=present
-  when: not openshift.common.is_atomic | bool
+  when: not openshift_is_atomic | bool
   register: result
   until: result is succeeded
diff --git a/roles/openshift_node/tasks/storage_plugins/glusterfs.yml b/roles/openshift_node/tasks/storage_plugins/glusterfs.yml
index e60f57ae7..c04a6922a 100644
--- a/roles/openshift_node/tasks/storage_plugins/glusterfs.yml
+++ b/roles/openshift_node/tasks/storage_plugins/glusterfs.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install GlusterFS storage plugin dependencies
   package: name=glusterfs-fuse state=present
-  when: not openshift.common.is_atomic | bool
+  when: not openshift_is_atomic | bool
   register: result
   until: result is succeeded
 
diff --git a/roles/openshift_node/tasks/storage_plugins/iscsi.yml b/roles/openshift_node/tasks/storage_plugins/iscsi.yml
index d3a3668d5..a8048c42f 100644
--- a/roles/openshift_node/tasks/storage_plugins/iscsi.yml
+++ b/roles/openshift_node/tasks/storage_plugins/iscsi.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install iSCSI storage plugin dependencies
   package: name=iscsi-initiator-utils state=present
-  when: not openshift.common.is_atomic | bool
+  when: not openshift_is_atomic | bool
   register: result
   until: result is succeeded
diff --git a/roles/openshift_node/tasks/storage_plugins/nfs.yml b/roles/openshift_node/tasks/storage_plugins/nfs.yml
index 1484aa076..c2922644f 100644
--- a/roles/openshift_node/tasks/storage_plugins/nfs.yml
+++ b/roles/openshift_node/tasks/storage_plugins/nfs.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install NFS storage plugin dependencies
   package: name=nfs-utils state=present
-  when: not openshift.common.is_atomic | bool
+  when: not openshift_is_atomic | bool
   register: result
   until: result is succeeded
 
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 262ee698b..e33a4999f 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -2,13 +2,13 @@
 - name: Install Node service file
   template:
     dest: "/etc/systemd/system/{{ openshift_service_type }}-node.service"
-    src: "{{ openshift.common.is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}"
+    src: "{{ openshift_is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}"
   when: not l_is_node_system_container | bool
   notify:
   - reload systemd units
   - restart node
 
-- when: openshift.common.is_containerized | bool
+- when: openshift_is_containerized | bool
   block:
   - name: include node deps docker service file
     include_tasks: config/install-node-deps-docker-service-file.yml
diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml
index f0a013e45..f62bde784 100644
--- a/roles/openshift_node/tasks/upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade.yml
@@ -1,10 +1,10 @@
 ---
 # input variables:
 # - l_docker_upgrade
-# - openshift.common.is_atomic
+# - openshift_is_atomic
 # - node_config_hook
 # - openshift_pkg_version
-# - openshift.common.is_containerized
+# - openshift_is_containerized
 # - deployment_type
 # - openshift_release
 
@@ -26,7 +26,7 @@
   include_tasks: upgrade/rpm_upgrade_install.yml
   vars:
     openshift_version: "{{ openshift_pkg_version | default('') }}"
-  when: not openshift.common.is_containerized | bool
+  when: not openshift_is_containerized | bool
 
 
 - include_tasks: "{{ node_config_hook }}"
diff --git a/roles/openshift_node/tasks/upgrade/config_changes.yml b/roles/openshift_node/tasks/upgrade/config_changes.yml
index 439700df6..50044eb3e 100644
--- a/roles/openshift_node/tasks/upgrade/config_changes.yml
+++ b/roles/openshift_node/tasks/upgrade/config_changes.yml
@@ -1,7 +1,7 @@
 ---
 - name: Update systemd units
   include_tasks: ../systemd_units.yml
-  when: openshift.common.is_containerized
+  when: openshift_is_containerized
 
 - name: Update oreg value
   yedit:
diff --git a/roles/openshift_node/tasks/upgrade/restart.yml b/roles/openshift_node/tasks/upgrade/restart.yml
index 45b0be0a0..bd6f42182 100644
--- a/roles/openshift_node/tasks/upgrade/restart.yml
+++ b/roles/openshift_node/tasks/upgrade/restart.yml
@@ -1,7 +1,7 @@
 ---
 # input variables:
 # - openshift_service_type
-# - openshift.common.is_containerized
+# - openshift_is_containerized
 # - openshift.common.hostname
 # - openshift.master.api_port
 
diff --git a/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml b/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml
index cc9a8f2d9..91a358095 100644
--- a/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml
@@ -3,7 +3,7 @@
 # - openshift_service_type
 # - component
 # - openshift_pkg_version
-# - openshift.common.is_atomic
+# - openshift_is_atomic
 
 # Pre-pull new node rpm, but don't install
 - name: download new node packages
diff --git a/roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml b/roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml
index 32eeb76c6..c9094e05a 100644
--- a/roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml
+++ b/roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml
@@ -3,7 +3,7 @@
 # - openshift_service_type
 # - component
 # - openshift_pkg_version
-# - openshift.common.is_atomic
+# - openshift_is_atomic
 
 # Install the pre-pulled RPM
 # Note: dnsmasq is covered in it's own play.  openvswitch is included here
diff --git a/roles/openshift_node/tasks/upgrade/stop_services.yml b/roles/openshift_node/tasks/upgrade/stop_services.yml
index 2fff556e5..6d92516c3 100644
--- a/roles/openshift_node/tasks/upgrade/stop_services.yml
+++ b/roles/openshift_node/tasks/upgrade/stop_services.yml
@@ -19,7 +19,7 @@
   - "{{ openshift_service_type }}-master-controllers"
   - "{{ openshift_service_type }}-node"
   failed_when: false
-  when: openshift.common.is_containerized | bool
+  when: openshift_is_containerized | bool
 
 - service:
     name: docker
@@ -40,4 +40,4 @@
   - "{{ openshift_service_type }}-node"
   - openvswitch
   failed_when: false
-  when: not openshift.common.is_containerized | bool
+  when: not openshift_is_containerized | bool
diff --git a/roles/openshift_node/tasks/upgrade_pre.yml b/roles/openshift_node/tasks/upgrade_pre.yml
index 7f591996c..3ae7dc6b6 100644
--- a/roles/openshift_node/tasks/upgrade_pre.yml
+++ b/roles/openshift_node/tasks/upgrade_pre.yml
@@ -11,7 +11,7 @@
   command: "{{ ansible_pkg_mgr }} makecache"
   register: result
   until: result is succeeded
-  when: not openshift.common.is_containerized | bool
+  when: not openshift_is_containerized | bool
 
 - name: Check Docker image count
   shell: "docker images -aq | wc -l"
@@ -26,7 +26,7 @@
   - l_docker_upgrade | bool
 
 - include_tasks: upgrade/containerized_upgrade_pull.yml
-  when: openshift.common.is_containerized | bool
+  when: openshift_is_containerized | bool
 
 # Prepull the rpms for docker upgrade, but don't install
 - name: download docker upgrade rpm
@@ -40,7 +40,7 @@
 - include_tasks: upgrade/rpm_upgrade.yml
   vars:
     openshift_version: "{{ openshift_pkg_version | default('') }}"
-  when: not openshift.common.is_containerized | bool
+  when: not openshift_is_containerized | bool
 
 # https://docs.openshift.com/container-platform/3.4/admin_guide/overcommit.html#disabling-swap-memory
 - name: Check for swap usage