diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-12 12:37:10 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-12 12:37:10 -0400 |
| commit | f63985e045852aa6eace6b1f25c4b76abbf1e1c5 (patch) | |
| tree | 96df7d0310a4cd4aeada922e916754f650724f6f /roles | |
| parent | 57ac47b9d3429994f60f5e3494507c697557f297 (diff) | |
| parent | 6d55d92799f40a0f2b9c67ef89802deed22ea34e (diff) | |
| download | openshift-f63985e045852aa6eace6b1f25c4b76abbf1e1c5.tar.gz openshift-f63985e045852aa6eace6b1f25c4b76abbf1e1c5.tar.bz2 openshift-f63985e045852aa6eace6b1f25c4b76abbf1e1c5.tar.xz openshift-f63985e045852aa6eace6b1f25c4b76abbf1e1c5.zip | |
Merge pull request #1737 from moolitayer/manageiq_sa_to_have_image_scanning_role
Add image-auditor role to ManageIQ SA
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_manageiq/tasks/main.yaml | 10 | ||||
| -rw-r--r-- | roles/openshift_manageiq/vars/main.yml | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/roles/openshift_manageiq/tasks/main.yaml b/roles/openshift_manageiq/tasks/main.yaml index 2a651df65..de0a7000e 100644 --- a/roles/openshift_manageiq/tasks/main.yaml +++ b/roles/openshift_manageiq/tasks/main.yaml @@ -59,6 +59,16 @@ failed_when: "'already exists' not in osmiq_perm_task.stderr and osmiq_perm_task.rc != 0" changed_when: osmiq_perm_task.rc == 0 +- name: Configure 3_2 role/user permissions + command: > + {{ openshift.common.admin_binary }} {{item}} + --config={{manage_iq_tmp_conf}} + with_items: "{{manage_iq_openshift_3_2_tasks}}" + register: osmiq_perm_3_2_task + failed_when: osmiq_perm_3_2_task.rc != 0 + changed_when: osmiq_perm_3_2_task.rc == 0 + when: openshift.common.version_gte_3_2_or_1_2 | bool + - name: Clean temporary configuration file command: > rm -f {{manage_iq_tmp_conf}} diff --git a/roles/openshift_manageiq/vars/main.yml b/roles/openshift_manageiq/vars/main.yml index 69ee2cb4c..b2aed79c7 100644 --- a/roles/openshift_manageiq/vars/main.yml +++ b/roles/openshift_manageiq/vars/main.yml @@ -30,3 +30,6 @@ manage_iq_tasks: - policy add-scc-to-user privileged system:serviceaccount:management-infra:management-admin - policy add-cluster-role-to-user system:image-puller system:serviceaccount:management-infra:inspector-admin - policy add-scc-to-user privileged system:serviceaccount:management-infra:inspector-admin + +manage_iq_openshift_3_2_tasks: + - policy add-cluster-role-to-user system:image-auditor system:serviceaccount:management-infra:management-admin |