summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Padgett <spadgett@redhat.com>2018-01-19 16:29:59 -0500
committerSamuel Padgett <spadgett@redhat.com>2018-01-19 16:29:59 -0500
commit7d7499efb48b00a320148d71e915193635707ea6 (patch)
tree553a314e08cf1c6e9eee7d4f55c6a0c7ab604399
parent7ad419c31b79c85d610143f95777040db4b5b1b7 (diff)
downloadopenshift-7d7499efb48b00a320148d71e915193635707ea6.tar.gz
openshift-7d7499efb48b00a320148d71e915193635707ea6.tar.bz2
openshift-7d7499efb48b00a320148d71e915193635707ea6.tar.xz
openshift-7d7499efb48b00a320148d71e915193635707ea6.zip
Bug 1536253: Pass `--config` flag on oc commands when installing console
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536253
-rw-r--r--roles/openshift_web_console/tasks/install.yml11
1 files changed, 9 insertions, 2 deletions
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: >