summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
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)