openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Include reseller admin role correctly"

Browse Source
This commit is contained in:
Jenkins 2016-04-01 07:11:15 +00:00 committed by Gerrit Code Review
commit ff68edac03
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

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