diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 16:16:28 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 16:16:28 -0400 |
| commit | 4068abc26265d2e7ec6e5829561e1c280f724aa9 (patch) | |
| tree | 00681ae838975fef46a141a6026785b21dc837a7 /roles/openshift_serviceaccounts | |
| parent | b9b08f0c169ad76bbbfaee85563fd3206464945a (diff) | |
| parent | 17f949dc9815f3fa0061ae9ad0aa0dfffeb01202 (diff) | |
| download | openshift-4068abc26265d2e7ec6e5829561e1c280f724aa9.tar.gz openshift-4068abc26265d2e7ec6e5829561e1c280f724aa9.tar.bz2 openshift-4068abc26265d2e7ec6e5829561e1c280f724aa9.tar.xz openshift-4068abc26265d2e7ec6e5829561e1c280f724aa9.zip | |
Merge pull request #1839 from abutcher/v2-deprecations
Cleanup various deprecation warnings.
Diffstat (limited to 'roles/openshift_serviceaccounts')
| -rw-r--r-- | roles/openshift_serviceaccounts/tasks/main.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_serviceaccounts/tasks/main.yml b/roles/openshift_serviceaccounts/tasks/main.yml index 5dd28d52a..bafda9695 100644 --- a/roles/openshift_serviceaccounts/tasks/main.yml +++ b/roles/openshift_serviceaccounts/tasks/main.yml @@ -1,7 +1,7 @@ - name: test if service accounts exists command: > {{ openshift.common.client_binary }} get sa {{ item }} -n {{ openshift_serviceaccounts_namespace }} - with_items: openshift_serviceaccounts_names + with_items: "{{ openshift_serviceaccounts_names }}" failed_when: false changed_when: false register: account_test @@ -13,8 +13,8 @@ -n {{ openshift_serviceaccounts_namespace }} create -f - when: item.1.rc != 0 with_together: - - openshift_serviceaccounts_names - - account_test.results + - "{{ openshift_serviceaccounts_names }}" + - "{{ account_test.results }}" - name: test if scc needs to be updated command: > @@ -22,7 +22,7 @@ changed_when: false failed_when: false register: scc_test - with_items: openshift_serviceaccounts_sccs + with_items: "{{ openshift_serviceaccounts_sccs }}" - name: Grant the user access to the privileged scc command: > @@ -30,8 +30,8 @@ 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 }}" with_nested: - - openshift_serviceaccounts_names - - scc_test.results + - "{{ openshift_serviceaccounts_names }}" + - "{{ scc_test.results }}" - include: legacy_add_scc_to_user.yml when: not openshift.common.version_gte_3_1_or_1_1 |