openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Include reseller admin role correctly

Browse Source 
The name of the reseller_admin_role in the proxy config needs
to map to the correct role within the deploy. It was specified
manually and inconsistently though a variable exists in the role
defaults.

Change-Id: Ib93fc57f1e26e8a0943a7bd7c2212ce94be54f7c
Closes-Bug: #1542391
This commit is contained in:
Steve Lewis 2016-03-31 13:54:24 -07:00
parent fabe88c625
commit 486adbe215
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/proxy-server.conf.j2
View File

@ -95,19 +95,19 @@ delay_auth_decision = {{ swift_delay_auth_decision }}
use = egg:swift#keystoneauth
{% if swift_allow_all_users is defined and swift_allow_all_users == True %}
{% if 'ceilometer' in swift_middleware_list %}
operator_roles = admin, swiftoperator, _member_, ResellerAdmin
operator_roles = admin, swiftoperator, _member_, {{ swift_reselleradmin_role }}
{% else %}
operator_roles = admin, swiftoperator, _member_
{% endif %}
{% else %}
{% if 'ceilometer' in swift_middleware_list %}
operator_roles = admin, swiftoperator, ResellerAdmin
operator_roles = admin, swiftoperator, {{ swift_reselleradmin_role }}
{% else %}
operator_roles = admin, swiftoperator
{% endif %}
{% endif %}
# The reseller admin role has the ability to create and delete accounts
reseller_admin_role = reseller_admin
reseller_admin_role = {{ swift_reselleradmin_role }}
{% endif %}
[filter:healthcheck]