From 7faceb67ad73a21a6c2ee626fc7acfb02bd6cb8a Mon Sep 17 00:00:00 2001 From: Donagh McCabe Date: Fri, 19 Dec 2014 13:20:45 +0000 Subject: [PATCH] Allow swift keystoneauth reseller_prefix in sample file The reseller_prefix option cannot be added to the swift-proxy-server.conf-sample file because it inadvertently gets set to "TEMPAUTH" and Tempest tests fail. Change-Id: Ib08d6fa1926531b8966151258eae6771c99c41ca Closes-Bug: 1404226 --- lib/swift | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/swift b/lib/swift index e9043b32a1..3c1f2ec5f9 100644 --- a/lib/swift +++ b/lib/swift @@ -401,11 +401,10 @@ function configure_swift { 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} - iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth account_autocreate + iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server account_autocreate true - iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix - iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix "TEMPAUTH" + # Configure Crossdomain iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:crossdomain use "egg:swift#crossdomain" @@ -422,6 +421,13 @@ function configure_swift { iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:keystoneauth operator_roles iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:keystoneauth operator_roles "Member, admin" + # Configure Tempauth. In the sample config file, Keystoneauth is commented + # out. Make sure we uncomment Tempauth after we uncomment Keystoneauth + # otherwise, this code also sets the reseller_prefix for Keystoneauth. + iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth account_autocreate + iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix + iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix "TEMPAUTH" + if is_service_enabled swift3; then cat <>${SWIFT_CONFIG_PROXY_SERVER} # NOTE(chmou): s3token middleware is not updated yet to use only