openstack
/
devstack
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2017-04-19 12:30:19 +00:00 committed by Gerrit Code Review
parent 4b9022ddd7 f43ea47766
commit 041a5d9d83
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