diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-24 13:01:50 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-24 13:01:50 -0400 |
| commit | 7b0a4588a728a5eb5cbf7f80ff48f7f1d704238e (patch) | |
| tree | 9ee6a26d3bc9a8f7d2879d257bbbcefa6ce1a10a | |
| parent | 6df4b9a58452a0cbecd07099d5f462bab9fb957a (diff) | |
| parent | 8bf8728bad2c15f3f9bd69ed4f336c7b28eae408 (diff) | |
| download | openshift-7b0a4588a728a5eb5cbf7f80ff48f7f1d704238e.tar.gz openshift-7b0a4588a728a5eb5cbf7f80ff48f7f1d704238e.tar.bz2 openshift-7b0a4588a728a5eb5cbf7f80ff48f7f1d704238e.tar.xz openshift-7b0a4588a728a5eb5cbf7f80ff48f7f1d704238e.zip | |
Merge pull request #1575 from enoodle/manageiq_sa_to_have_image_puller_role
ManageIQ SA: Adding image-puller role
| -rw-r--r-- | roles/openshift_manageiq/tasks/main.yaml | 13 | ||||
| -rw-r--r-- | roles/openshift_manageiq/vars/main.yml | 8 |
2 files changed, 20 insertions, 1 deletions
diff --git a/roles/openshift_manageiq/tasks/main.yaml b/roles/openshift_manageiq/tasks/main.yaml index d2ff1b4b7..2a651df65 100644 --- a/roles/openshift_manageiq/tasks/main.yaml +++ b/roles/openshift_manageiq/tasks/main.yaml @@ -18,7 +18,7 @@ failed_when: "'already exists' not in osmiq_create_mi_project.stderr and osmiq_create_mi_project.rc != 0" changed_when: osmiq_create_mi_project.rc == 0 -- name: Create Service Account +- name: Create Admin Service Account shell: > echo {{ manageiq_service_account | to_json | quote }} | {{ openshift.common.client_binary }} create @@ -29,6 +29,17 @@ failed_when: "'already exists' not in osmiq_create_service_account.stderr and osmiq_create_service_account.rc != 0" changed_when: osmiq_create_service_account.rc == 0 +- name: Create Image Inspector Service Account + shell: > + echo {{ manageiq_image_inspector_service_account | to_json | quote }} | + {{ openshift.common.client_binary }} create + -n management-infra + --config={{manage_iq_tmp_conf}} + -f - + register: osmiq_create_service_account + failed_when: "'already exists' not in osmiq_create_service_account.stderr and osmiq_create_service_account.rc != 0" + changed_when: osmiq_create_service_account.rc == 0 + - name: Create Cluster Role shell: > echo {{ manageiq_cluster_role | to_json | quote }} | diff --git a/roles/openshift_manageiq/vars/main.yml b/roles/openshift_manageiq/vars/main.yml index 77e1c304b..69ee2cb4c 100644 --- a/roles/openshift_manageiq/vars/main.yml +++ b/roles/openshift_manageiq/vars/main.yml @@ -15,6 +15,12 @@ manageiq_service_account: metadata: name: management-admin +manageiq_image_inspector_service_account: + apiVersion: v1 + kind: ServiceAccount + metadata: + name: inspector-admin + manage_iq_tmp_conf: /tmp/manageiq_admin.kubeconfig manage_iq_tasks: @@ -22,3 +28,5 @@ manage_iq_tasks: - policy add-role-to-user -n management-infra management-infra-admin -z management-admin - policy add-cluster-role-to-user cluster-reader system:serviceaccount:management-infra:management-admin - 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 |