diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-20 07:36:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 07:36:00 -0800 |
| commit | e692d7d757742f82dc6ba554110c78a0d0ccbcf6 (patch) | |
| tree | c9abe144be7ddbbab64259c1a61cbbc1b4ba6010 /roles | |
| parent | 0e9d896d0c112a10a684a12412fd9b9ce271c462 (diff) | |
| parent | 7d7499efb48b00a320148d71e915193635707ea6 (diff) | |
| download | openshift-e692d7d757742f82dc6ba554110c78a0d0ccbcf6.tar.gz openshift-e692d7d757742f82dc6ba554110c78a0d0ccbcf6.tar.bz2 openshift-e692d7d757742f82dc6ba554110c78a0d0ccbcf6.tar.xz openshift-e692d7d757742f82dc6ba554110c78a0d0ccbcf6.zip | |
Merge pull request #6799 from spadgett/console-admin-kubeconfig
Automatic merge from submit-queue.
Bug 1536253: Pass `--config` flag on oc commands when installing console
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536253
/assign @sdodson
/kind bug
@jupierce cc
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_web_console/tasks/install.yml | 11 |
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: > |