openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Replace swiftoperator role with swift_operator_role variable

Browse Source 
Though a `swift_operator_role` variable exists to allow specifying an
operator role other than `swiftoperator`, it is not applied to all
uses of the role, eg the proxy-server.conf template.

Replace all remaining hard-coded references to the `swiftoperator`
role with the `swift_operator_role` variable.

Change-Id: Ie6db872cc2b7a1b1a90d9a690ee08937a9cab785
Signed-off-by: Corey Wright <corey.wright@rackspace.com>
This commit is contained in:
Corey Wright 2018-06-21 13:24:13 -05:00
parent 8cdaee5b85
commit 6654e4835d
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.
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

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

@ -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

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

@ -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