openstack/devstack
Code Issues Proposed changes

Send useful auth_port and auth_prefix to swift's test.conf

Browse Source 
Until we can test with a version of swiftclient that knows how to eat
auth_uri, swift still needs a working gate.

Change-Id: I09f9ad5c87b542df962a79898e06fbf1e968b1e3
Related-Change: I46294fb24e3c23fa19fcfd7d6c9ee8a932354702
Related-Change: Ie427f3b0b9eb834ff940fa5d52444a5a6cdcab15
This commit is contained in:
Tim Burke 2017-04-18 21:51:57 -07:00
parent cf2846ab64
commit f43ea47766
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/swift
View File

@ -530,12 +530,16 @@ EOF
local auth_vers
auth_vers=$(iniget ${testfile} func_test auth_version)
iniset ${testfile} func_test auth_host ${KEYSTONE_SERVICE_HOST}
iniset ${testfile} func_test auth_port ${KEYSTONE_AUTH_PORT}
iniset ${testfile} func_test auth_uri ${KEYSTONE_AUTH_URI}
if [[ $auth_vers == "3" ]]; then
iniset ${testfile} func_test auth_prefix /v3/
if [[ "$KEYSTONE_AUTH_PROTOCOL" == "https" ]]; then
iniset ${testfile} func_test auth_port 443
else
iniset ${testfile} func_test auth_prefix /v2.0/
iniset ${testfile} func_test auth_port 80
fi
iniset ${testfile} func_test auth_uri ${KEYSTONE_AUTH_URI}
if [[ "$auth_vers" == "3" ]]; then
iniset ${testfile} func_test auth_prefix /identity/v3/
else
iniset ${testfile} func_test auth_prefix /identity/v2.0/
fi
fi