@@ -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 <<EOF >>${SWIFT_CONFIG_PROXY_SERVER}

 # NOTE(chmou): s3token middleware is not updated yet to use only