From e6c159afb4ba39a7266c750d43d6a5e911cc8f21 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Mon, 18 Dec 2017 16:13:36 -0500
Subject: 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.
---
 roles/nuage_master/tasks/main.yaml          | 18 +++++++++---------
 roles/nuage_master/tasks/serviceaccount.yml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'roles/nuage_master')

diff --git a/roles/nuage_master/tasks/main.yaml b/roles/nuage_master/tasks/main.yaml
index c264427de..29e16b6f8 100644
--- a/roles/nuage_master/tasks/main.yaml
+++ b/roles/nuage_master/tasks/main.yaml
@@ -5,22 +5,22 @@
 - name: Set the Nuage certificate directory fact for Atomic hosts
   set_fact:
     cert_output_dir: /var/usr/share/nuage-openshift-monitor
-  when: openshift.common.is_atomic | bool
+  when: openshift_is_atomic | bool
 
 - name: Set the Nuage kubeconfig file path fact for Atomic hosts
   set_fact:
     kube_config: /var/usr/share/nuage-openshift-monitor/nuage.kubeconfig
-  when: openshift.common.is_atomic | bool
+  when: openshift_is_atomic | bool
 
 - name: Set the Nuage monitor yaml location fact for Atomic hosts
   set_fact:
     kubemon_yaml: /var/usr/share/nuage-openshift-monitor/nuage-openshift-monitor.yaml
-  when: openshift.common.is_atomic | bool
+  when: openshift_is_atomic | bool
 
 - name: Set the Nuage monitor certs location fact for Atomic hosts
   set_fact:
     nuage_master_crt_dir: /var/usr/share/nuage-openshift-monitor/
-  when: openshift.common.is_atomic | bool
+  when: openshift_is_atomic | bool
 
 - name: Set the Nuage master config directory for daemon sets install
   set_fact:
@@ -35,27 +35,27 @@
 - name: Set the Nuage CNI plugin binary directory for daemon sets install
   set_fact:
     nuage_cni_bin_dsets_mount_dir: /var/opt/cni/bin
-  when: openshift.common.is_atomic | bool
+  when: openshift_is_atomic | bool
 
 - name: Create directory /usr/share/nuage-openshift-monitor
   become: yes
   file: path=/usr/share/nuage-openshift-monitor state=directory
-  when: not openshift.common.is_atomic | bool
+  when: not openshift_is_atomic | bool
 
 - name: Create directory /var/usr/share/nuage-openshift-monitor
   become: yes
   file: path=/var/usr/share/nuage-openshift-monitor state=directory
-  when: openshift.common.is_atomic | bool
+  when: openshift_is_atomic | bool
 
 - name: Create directory /var/usr/bin for monitor binary on atomic
   become: yes
   file: path=/var/usr/bin state=directory
-  when: openshift.common.is_atomic | bool
+  when: openshift_is_atomic | bool
 
 - name: Create CNI bin directory /var/opt/cni/bin
   become: yes
   file: path=/var/opt/cni/bin state=directory
-  when: openshift.common.is_atomic | bool
+  when: openshift_is_atomic | bool
 
 - name: Create the log directory
   become: yes
diff --git a/roles/nuage_master/tasks/serviceaccount.yml b/roles/nuage_master/tasks/serviceaccount.yml
index fbf2c4f8d..9127b33d6 100644
--- a/roles/nuage_master/tasks/serviceaccount.yml
+++ b/roles/nuage_master/tasks/serviceaccount.yml
@@ -19,7 +19,7 @@
 
 - name: Generate the node client config
   command: >
-    {{ openshift.common.client_binary }} adm create-api-client-config
+    {{ openshift_client_binary }} adm create-api-client-config
       --certificate-authority={{ openshift_master_ca_cert }}
       --client-dir={{ cert_output_dir }}
       --master={{ openshift.master.api_url }}
-- 
cgit v1.2.1