summaryrefslogtreecommitdiffstats
path: root/gluster
diff options
context:
space:
mode:
authorThiago da Silva <thiago@redhat.com>2013-11-04 17:08:22 -0500
committerLuis Pabon <lpabon@redhat.com>2013-11-05 17:23:33 -0800
commita5c772955f5f74c2244d298641be9e2a448c9b94 (patch)
treea44e9c19e277a18c61fd606ca902e31d0e58c433 /gluster
parent2bd930bb442d29aab176651a27cee8dab0dee4eb (diff)
make gluster volume name configurable
changed code to look at configuration file for the metadata gluster volume name. The default is still gsmetadata Change-Id: I9bf74b9566ea1c9716c42f7ced0f999e02824868 Signed-off-by: Thiago da Silva <thiago@redhat.com> Reviewed-on: http://review.gluster.org/6225 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'gluster')
-rw-r--r--gluster/swift/common/middleware/gswauth/swauth/middleware.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
index 77ff72c..f01182f 100644
--- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py
+++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
@@ -92,7 +92,10 @@ class Swauth(object):
pass
raise ValueError(msg)
self.swauth_remote_timeout = int(conf.get('swauth_remote_timeout', 10))
- self.auth_account = '%sgsmetadata' % self.reseller_prefix
+
+ self.metadata_volume = conf.get('metadata_volume', 'gsmetadata')
+ self.auth_account = '%s%s' % (self.reseller_prefix,
+ self.metadata_volume)
self.default_swift_cluster = conf.get(
'default_swift_cluster',
'local#http://127.0.0.1:8080/v1')