summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorThiago da Silva <thiago@redhat.com>2013-11-05 14:32:59 -0500
committerLuis Pabon <lpabon@redhat.com>2013-11-13 13:41:16 -0800
commit40553ff9586aedccbddfbc57ce9c65463aac95b7 (patch)
tree6cb968ec40b798e331b961dc7c400f6373af2161 /test
parent810b399d243c05343d8fd24b5fb597e2abe4cd61 (diff)
renaming instances of swauth to gswauth
changed code where appropriate to gswauth instead of swauth Change-Id: Iadcec4f379fae3f063379b4899797b375290cc7b Signed-off-by: Thiago da Silva <thiago@redhat.com> Reviewed-on: http://review.gluster.org/6226 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/functional_auth/gswauth/conf/proxy-server.conf10
-rw-r--r--test/functional_auth/gswauth/conf/test.conf2
2 files changed, 6 insertions, 6 deletions
diff --git a/test/functional_auth/gswauth/conf/proxy-server.conf b/test/functional_auth/gswauth/conf/proxy-server.conf
index 90beb51..89f95f4 100644
--- a/test/functional_auth/gswauth/conf/proxy-server.conf
+++ b/test/functional_auth/gswauth/conf/proxy-server.conf
@@ -5,7 +5,7 @@ user = root
workers = 1
[pipeline:main]
-pipeline = catch_errors healthcheck proxy-logging cache swauth proxy-logging proxy-server
+pipeline = catch_errors healthcheck proxy-logging cache gswauth proxy-logging proxy-server
[app:proxy-server]
use = egg:gluster_swift#proxy
@@ -60,10 +60,10 @@ user_test_tester = testing .admin
user_test2_tester2 = testing2 .admin
user_test_tester3 = testing3
-[filter:swauth]
-use = egg:gluster_swift#swauth
-set log_name = swauth
-super_admin_key = swauthkey
+[filter:gswauth]
+use = egg:gluster_swift#gswauth
+set log_name = gswauth
+super_admin_key = gswauthkey
metadata_volume = gsmetadata
[filter:cache]
diff --git a/test/functional_auth/gswauth/conf/test.conf b/test/functional_auth/gswauth/conf/test.conf
index 7f7f5cf..f490f36 100644
--- a/test/functional_auth/gswauth/conf/test.conf
+++ b/test/functional_auth/gswauth/conf/test.conf
@@ -12,7 +12,7 @@ auth_prefix = /auth/
#auth_prefix = /v2.0/
# GSWauth internal admin user configuration information
-admin_key = swauthkey
+admin_key = gswauthkey
admin_user = .super_admin
# Primary functional test account (needs admin access to the account)