openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Replace swiftoperator role with swift_operator_role variable"

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/configure-swift-add.rst
View File

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

4
doc/source/configure-swift.rst
View File

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

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

@ -85,15 +85,15 @@ 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_, {{ swift_reselleradmin_role }} operator_roles = admin, {{ swift_operator_role }}, _member_, {{ swift_reselleradmin_role }}
{% else %} {% else %}
operator_roles = admin, swiftoperator, _member_ operator_roles = admin, {{ swift_operator_role }}, _member_
{% endif %} {% endif %}
{% else %} {% else %}
{% if 'ceilometer' in swift_middleware_list %} {% if 'ceilometer' in swift_middleware_list %}
operator_roles = admin, swiftoperator, {{ swift_reselleradmin_role }} operator_roles = admin, {{ swift_operator_role }}, {{ swift_reselleradmin_role }}
{% else %} {% else %}
operator_roles = admin, swiftoperator operator_roles = admin, {{ swift_operator_role }}
{% 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