diff options
author | Russell Teague <rteague@redhat.com> | 2018-01-29 15:30:30 -0500 |
---|---|---|
committer | Russell Teague <rteague@redhat.com> | 2018-01-29 15:52:25 -0500 |
commit | 53ed4ededbbac3ca0095051885aecd0674fbf867 (patch) | |
tree | e4273a4f59b2d394a5f14434de00e987bf14295e /roles/openshift_management/tasks/accounts.yml | |
parent | 2ec70a36f50f670887f2f257d348db6332de5d26 (diff) | |
download | openshift-53ed4ededbbac3ca0095051885aecd0674fbf867.tar.gz openshift-53ed4ededbbac3ca0095051885aecd0674fbf867.tar.bz2 openshift-53ed4ededbbac3ca0095051885aecd0674fbf867.tar.xz openshift-53ed4ededbbac3ca0095051885aecd0674fbf867.zip |
[1538960] Correct ability to overried openshift_management_app_template
* Converted 'flavor' logic to be based on app template
* Converted 'ext-db' logic to use var based on app template
* Prepended role private vars with '__' for consistency
Bug 1538960
https://bugzilla.redhat.com/show_bug.cgi?id=1538960
Diffstat (limited to 'roles/openshift_management/tasks/accounts.yml')
-rw-r--r-- | roles/openshift_management/tasks/accounts.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_management/tasks/accounts.yml b/roles/openshift_management/tasks/accounts.yml index e45ea8d43..80318fec0 100644 --- a/roles/openshift_management/tasks/accounts.yml +++ b/roles/openshift_management/tasks/accounts.yml @@ -5,14 +5,14 @@ oc_serviceaccount: namespace: "{{ openshift_management_project }}" state: present - name: "{{ openshift_management_flavor_short }}{{ item.name }}" + name: "{{ __openshift_management_flavor_short }}{{ item.name }}" with_items: - "{{ __openshift_system_account_sccs }}" - name: Ensure the CFME system accounts have all the required SCCs oc_adm_policy_user: namespace: "{{ openshift_management_project }}" - user: "system:serviceaccount:{{ openshift_management_project }}:{{ openshift_management_flavor_short }}{{ item.name }}" + user: "system:serviceaccount:{{ openshift_management_project }}:{{ __openshift_management_flavor_short }}{{ item.name }}" resource_kind: scc resource_name: "{{ item.resource_name }}" with_items: @@ -21,7 +21,7 @@ - name: Ensure the CFME system accounts have the required roles oc_adm_policy_user: namespace: "{{ openshift_management_project }}" - user: "system:serviceaccount:{{ openshift_management_project }}:{{ openshift_management_flavor_short }}{{ item.name }}" + user: "system:serviceaccount:{{ openshift_management_project }}:{{ __openshift_management_flavor_short }}{{ item.name }}" resource_kind: role resource_name: "{{ item.resource_name }}" with_items: |