From badaa6dc09abfcbfb2770a2d2070c803a2aaaf03 Mon Sep 17 00:00:00 2001
From: Steve Milner <smilner@redhat.com>
Date: Thu, 9 Feb 2017 11:57:57 -0500
Subject: oc serviceaccount now done via oc_serviceaccount module

---
 roles/nuage_master/tasks/serviceaccount.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'roles/nuage_master/tasks')

diff --git a/roles/nuage_master/tasks/serviceaccount.yml b/roles/nuage_master/tasks/serviceaccount.yml
index 41143772e..16ea08244 100644
--- a/roles/nuage_master/tasks/serviceaccount.yml
+++ b/roles/nuage_master/tasks/serviceaccount.yml
@@ -13,20 +13,16 @@
   changed_when: false
 
 - name: Create Admin Service Account
-  shell: >
-    echo {{ nuage_service_account_config | to_json | quote }} |
-    {{ openshift.common.client_binary }} create
-    -n default
-    --config={{nuage_tmp_conf}}
-    -f -
-  register: osnuage_create_service_account
-  failed_when: "'already exists' not in osnuage_create_service_account.stderr and osnuage_create_service_account.rc != 0"
-  changed_when: osnuage_create_service_account.rc == 0
+  oc_serviceaccount:
+    kubeconfig: "{{ openshift_master_config_dir }}/admin.kubeconfig"
+    name: nuage
+    namespace: default
+    state: present
 
 - name: Configure role/user permissions
   command: >
     {{ openshift.common.client_binary }} adm {{item}}
-    --config={{nuage_tmp_conf}}
+    --config={{ nuage_tmp_conf }}
   with_items: "{{nuage_tasks}}"
   register: osnuage_perm_task
   failed_when: "'the object has been modified' not in osnuage_perm_task.stderr and osnuage_perm_task.rc != 0"
-- 
cgit v1.2.3