Skip to content

Commit

Permalink
Bug 1536253: Pass --config flag on oc commands when installing console
Browse files Browse the repository at this point in the history
  • Loading branch information
spadgett committed Jan 19, 2018
1 parent 7ad419c commit 7d7499e
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions roles/openshift_web_console/tasks/install.yml
Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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: >
Expand All @@ -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: >
Expand Down

0 comments on commit 7d7499e

Please sign in to comment.