diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-16 07:30:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 07:30:07 -0800 |
| commit | 3a7f1992410edd296ec1fa15dddd67d82a545f9f (patch) | |
| tree | 4f27b80b38eb7cac9fe77c7ccdd85f8471c41f27 /roles | |
| parent | 0d59a0868971e7f038b775adef024a8f324ab010 (diff) | |
| parent | 486b746324171edd691fd1682ef1221825157e62 (diff) | |
| download | openshift-3a7f1992410edd296ec1fa15dddd67d82a545f9f.tar.gz openshift-3a7f1992410edd296ec1fa15dddd67d82a545f9f.tar.bz2 openshift-3a7f1992410edd296ec1fa15dddd67d82a545f9f.tar.xz openshift-3a7f1992410edd296ec1fa15dddd67d82a545f9f.zip | |
Merge pull request #6706 from spadgett/console-rbac
Automatic merge from submit-queue.
Add console RBAC template
Required for https://github.com/openshift/origin-web-console-server/pull/18
Origin changes: https://github.com/openshift/origin/pull/18075
/assign @sdodson
/cc @deads2k
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_web_console/tasks/install.yml | 13 | ||||
| -rw-r--r-- | roles/openshift_web_console/vars/main.yml | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml index 12916961b..287d8973d 100644 --- a/roles/openshift_web_console/tasks/install.yml +++ b/roles/openshift_web_console/tasks/install.yml @@ -21,20 +21,21 @@ node_selector: - "" -- name: Make temp directory for asset config files +- name: Make temp directory for the web console config files command: mktemp -d /tmp/console-ansible-XXXXXX register: mktemp changed_when: False -- name: Copy asset config template to temp directory +- name: Copy the web console config template to temp directory copy: src: "{{ __console_files_location }}/{{ item }}" dest: "{{ mktemp.stdout }}/{{ item }}" with_items: - "{{ __console_template_file }}" + - "{{ __console_rbac_file }}" - "{{ __console_config_file }}" -- name: Update asset config properties +- name: Update the web console config properties yedit: src: "{{ mktemp.stdout }}/{{ __console_config_file }}" edits: @@ -50,7 +51,11 @@ src: "{{ mktemp.stdout }}/{{ __console_config_file }}" register: config -- name: Apply template file +- 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 - + +- name: Apply the web console template file shell: > {{ openshift_client_binary }} process -f "{{ mktemp.stdout }}/{{ __console_template_file }}" --param API_SERVER_CONFIG="{{ config['content'] | b64decode }}" diff --git a/roles/openshift_web_console/vars/main.yml b/roles/openshift_web_console/vars/main.yml index 80bc56a17..e91048e38 100644 --- a/roles/openshift_web_console/vars/main.yml +++ b/roles/openshift_web_console/vars/main.yml @@ -2,4 +2,5 @@ __console_files_location: "../../../files/origin-components/" __console_template_file: "console-template.yaml" +__console_rbac_file: "console-rbac-template.yaml" __console_config_file: "console-config.yaml" |