summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChmouel Boudjnah <chmouel@chmouel.com>2012-04-02 17:15:47 +0200
committerChmouel Boudjnah <chmouel@chmouel.com>2012-04-03 20:41:39 +0200
commit6e43d30e98ebbfec22d7749f4da5debb2f8394d6 (patch)
tree2e8cf23462686e07742347bea9b742a64666d5b0
parentba703d4ae0961866fb606d5c2822bfd5e295b081 (diff)
downloadkeystone-6e43d30e98ebbfec22d7749f4da5debb2f8394d6.tar.gz
keystone-6e43d30e98ebbfec22d7749f4da5debb2f8394d6.tar.xz
keystone-6e43d30e98ebbfec22d7749f4da5debb2f8394d6.zip
Add a _ at the end of reseller_prefix default.
- Fixes bug 971592. Change-Id: Ic9edb2b8b0043413e4ec16de9c669646ae4230a6
-rw-r--r--keystone/middleware/swift_auth.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/keystone/middleware/swift_auth.py b/keystone/middleware/swift_auth.py
index b5f0a9b1..19f8cab9 100644
--- a/keystone/middleware/swift_auth.py
+++ b/keystone/middleware/swift_auth.py
@@ -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',