From 7d7499efb48b00a320148d71e915193635707ea6 Mon Sep 17 00:00:00 2001
From: Samuel Padgett <spadgett@redhat.com>
Date: Fri, 19 Jan 2018 16:29:59 -0500
Subject: Bug 1536253: Pass `--config` flag on oc commands when installing
 console

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536253
---
 roles/openshift_web_console/tasks/install.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'roles/openshift_web_console')

diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml
index 50e72657f..f2e6026dc 100644
--- a/roles/openshift_web_console/tasks/install.yml
+++ b/roles/openshift_web_console/tasks/install.yml
@@ -26,6 +26,11 @@
   register: mktemp
   changed_when: False
 
+- name: Copy admin client config
+  command: >
+    cp {{ openshift.common.config_base }}/master//admin.kubeconfig {{ mktemp.stdout }}/admin.kubeconfig
+  changed_when: false
+
 - name: Copy the web console config template to temp directory
   copy:
     src: "{{ __console_files_location }}/{{ item }}"
@@ -80,7 +85,8 @@
 
 - name: Reconcile with the web console RBAC file
   shell: >
-    {{ openshift_client_binary }} process -f "{{ mktemp.stdout }}/{{ __console_rbac_file }}" | {{ openshift_client_binary }} auth reconcile -f -
+    {{ openshift_client_binary }} process -f "{{ mktemp.stdout }}/{{ __console_rbac_file }}" --config={{ mktemp.stdout }}/admin.kubeconfig
+    | {{ openshift_client_binary }} auth reconcile --config={{ mktemp.stdout }}/admin.kubeconfig -f -
 
 - name: Apply the web console template file
   shell: >
@@ -89,7 +95,8 @@
     --param IMAGE="{{ openshift_web_console_prefix }}{{ openshift_web_console_image_name }}:{{ openshift_web_console_version }}"
     --param NODE_SELECTOR={{ openshift_web_console_nodeselector | to_json | quote }}
     --param REPLICA_COUNT="{{ openshift_web_console_replica_count }}"
-    | {{ openshift_client_binary }} apply -f -
+    --config={{ mktemp.stdout }}/admin.kubeconfig
+    | {{ openshift_client_binary }} apply --config={{ mktemp.stdout }}/admin.kubeconfig -f -
 
 - name: Verify that the web console is running
   command: >
-- 
cgit v1.2.3