openstack/devstack
Code Issues Proposed changes

Merge "Only enable auth_token in swift with keystone"

Browse Source
This commit is contained in:
Jenkins 2014-07-04 00:01:20 +00:00 committed by Gerrit Code Review
commit 2fac95910f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/swift
View File

@ -354,7 +354,12 @@ function configure_swift {
if is_service_enabled swift3;then if is_service_enabled swift3;then
swift_pipeline+=" swift3 s3token " swift_pipeline+=" swift3 s3token "
fi fi
swift_pipeline+=" authtoken keystoneauth tempauth "
if is_service_enabled key;then
swift_pipeline+=" authtoken keystoneauth"
fi
swift_pipeline+=" tempauth "
sed -i "/^pipeline/ { s/tempauth/${swift_pipeline} ${SWIFT_EXTRAS_MIDDLEWARE}/ ;}" ${SWIFT_CONFIG_PROXY_SERVER} sed -i "/^pipeline/ { s/tempauth/${swift_pipeline} ${SWIFT_EXTRAS_MIDDLEWARE}/ ;}" ${SWIFT_CONFIG_PROXY_SERVER}
sed -i "/^pipeline/ { s/proxy-server/${SWIFT_EXTRAS_MIDDLEWARE_LAST} proxy-server/ ; }" ${SWIFT_CONFIG_PROXY_SERVER} sed -i "/^pipeline/ { s/proxy-server/${SWIFT_EXTRAS_MIDDLEWARE_LAST} proxy-server/ ; }" ${SWIFT_CONFIG_PROXY_SERVER}