openstack
/
keystone
Code Issues Proposed changes

Add a _ at the end of reseller_prefix default. 

- Fixes bug 971592.

Change-Id: Ic9edb2b8b0043413e4ec16de9c669646ae4230a6
This commit is contained in:
Chmouel Boudjnah 2012-04-02 17:15:47 +02:00 committed by Thierry Carrez
parent 0a0513d9fb
commit aa542c420a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keystone/middleware/swift_auth.py
View File

@ -77,6 +77,15 @@ class SwiftAuth(object):
hellocorp that user will be admin on that account and can give ACL
to all other users for hellocorp.
If you need to have a different reseller_prefix to be able to
mix different auth servers you can configure the option
reseller_prefix in your swiftauth entry like this :
reseller_prefix = NEWAUTH_
Make sure you have a underscore at the end of your new
reseller_prefix option.
:param app: The next WSGI app in the pipeline
:param conf: The dict of configuration values
"""
@ -84,7 +93,7 @@ class SwiftAuth(object):
self.app = app
self.conf = conf
self.logger = swift_utils.get_logger(conf, log_route='keystoneauth')
self.reseller_prefix = conf.get('reseller_prefix', 'AUTH').strip()
self.reseller_prefix = conf.get('reseller_prefix', 'AUTH_').strip()
self.operator_roles = conf.get('operator_roles',
'admin, swiftoperator')
self.reseller_admin_role = conf.get('reseller_admin_role',