Merge "Replace swiftoperator role with swift_operator_role variable"

This commit is contained in:
Zuul 2018-07-02 15:22:11 +00:00 committed by Gerrit Code Review
commit 6061ad9d9b
3 changed files with 8 additions and 8 deletions

@ -19,8 +19,8 @@ existing deployment.
to swift.
If this value is ``False``, by default only users with the
``admin`` or ``swiftoperator`` role can create containers or
manage tenants.
``admin`` role or role set in ``swift_operator_role`` can create
containers or manage tenants.
When the backend type for the glance is set to
``swift``, glance can access the swift cluster

@ -34,8 +34,8 @@ usage.
to Object Storage.
If this value is ``False``, then by default, only users with the
admin or ``swiftoperator`` role are allowed to create containers or
manage tenants.
admin role or role set in ``swift_operator_role`` are allowed to
create containers or manage tenants.
When the backend type for the Image Service (glance) is set to
``swift``, glance can access the swift cluster

@ -85,15 +85,15 @@ memcache_secret_key = {{ memcached_encryption_key }}
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_, {{ swift_reselleradmin_role }}
operator_roles = admin, {{ swift_operator_role }}, _member_, {{ swift_reselleradmin_role }}
{% else %}
operator_roles = admin, swiftoperator, _member_
operator_roles = admin, {{ swift_operator_role }}, _member_
{% endif %}
{% else %}
{% if 'ceilometer' in swift_middleware_list %}
operator_roles = admin, swiftoperator, {{ swift_reselleradmin_role }}
operator_roles = admin, {{ swift_operator_role }}, {{ swift_reselleradmin_role }}
{% else %}
operator_roles = admin, swiftoperator
operator_roles = admin, {{ swift_operator_role }}
{% endif %}
{% endif %}
# The reseller admin role has the ability to create and delete accounts