diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-07-08 10:11:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 10:11:04 -0400 |
| commit | 69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4 (patch) | |
| tree | 0419cfc12d414a95c987f7667f6618fba923c522 /roles/openshift_serviceaccounts/tasks | |
| parent | 8a0c9b6b6a9820b38694cb23979ffc7a8c358588 (diff) | |
| parent | 57dfae185d3d0e02ebe515263c54867bee37b45e (diff) | |
| download | openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.gz openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.bz2 openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.xz openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.zip | |
Merge pull request #2023 from abutcher/openshift-hosted
Various hosted component improvements
Diffstat (limited to 'roles/openshift_serviceaccounts/tasks')
| -rw-r--r-- | roles/openshift_serviceaccounts/tasks/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_serviceaccounts/tasks/main.yml b/roles/openshift_serviceaccounts/tasks/main.yml index bafda9695..e90384d37 100644 --- a/roles/openshift_serviceaccounts/tasks/main.yml +++ b/roles/openshift_serviceaccounts/tasks/main.yml @@ -24,11 +24,11 @@ register: scc_test with_items: "{{ openshift_serviceaccounts_sccs }}" -- name: Grant the user access to the privileged scc +- name: Grant the user access to the appropriate scc command: > {{ openshift.common.admin_binary }} policy add-scc-to-user - privileged system:serviceaccount:{{ openshift_serviceaccounts_namespace }}:{{ item.0 }} - when: "openshift.common.version_gte_3_1_or_1_1 and item.1.rc == 0 and 'system:serviceaccount:{{ openshift_serviceaccounts_namespace }}:{{ item.0 }}' not in {{ (item.1.stdout | from_yaml).users }}" + {{ item.1.item }} system:serviceaccount:{{ openshift_serviceaccounts_namespace }}:{{ item.0 }} + when: "openshift.common.version_gte_3_1_or_1_1 and item.1.rc == 0 and 'system:serviceaccount:{{ openshift_serviceaccounts_namespace }}:{{ item.0 }}' not in {{ (item.1.stdout | from_yaml).users | default([]) }}" with_nested: - "{{ openshift_serviceaccounts_names }}" - "{{ scc_test.results }}" |