Add to multi-tenant swift store documentation

Make the usage of the 'swift_store_admin_tenants' parameter
a little clearer.

Fixes bug 1110597.

Change-Id: Ibcfe5d74b89e35ac65d442ebfa6f75b0f8519af4
This commit is contained in:
Stuart McLaren 2013-01-30 17:30:13 +00:00
parent 2fdd1df173
commit dd28e13a5c
2 changed files with 24 additions and 6 deletions

View File

@ -429,10 +429,20 @@ Can only be specified in configuration files.
`This option is specific to the Swift storage backend.`
Optional. Default: ``[]``
Optional. Default: Not set.
A list of tenants that will be granted read/write access on all Swift containers
created by Glance in multi tenant mode.
A list of swift ACL strings that will be applied as both read and
write ACLs to the containers created by Glance in multi-tenant
mode. This grants the specified tenants/users read and write access
to all newly created image objects. The standard swift ACL string
formats are allowed, including:
<tenant_id>:<username>
<tenant_name>:<username>
\*:<username>
Multiple ACLs can be combined using a comma separated list, for
example: swift_store_admin_tenants = service:glance,*:admin
Configuring the S3 Storage Backend

View File

@ -239,9 +239,17 @@ swift_enable_snet = False
# to be stored in tenant specific Swift accounts.
#swift_store_multi_tenant = False
# A list of tenants that will be granted read/write access on all Swift
# containers created by Glance in multi-tenant mode.
#swift_store_admin_tenants = []
# A list of swift ACL strings that will be applied as both read and
# write ACLs to the containers created by Glance in multi-tenant
# mode. This grants the specified tenants/users read and write access
# to all newly created image objects. The standard swift ACL string
# formats are allowed, including:
# <tenant_id>:<username>
# <tenant_name>:<username>
# *:<username>
# Multiple ACLs can be combined using a comma separated list, for
# example: swift_store_admin_tenants = service:glance,*:admin
#swift_store_admin_tenants =
# The region of the swift endpoint to be used for single tenant. This setting
# is only necessary if the tenant has multiple swift endpoints.