Browse code

Merge "Allow both Keystone and Tempauth reseller prefixes"

Jenkins authored on 2017/09/12 17:55:31
Showing 1 changed files
... ...
@@ -464,6 +464,9 @@ function configure_swift {
464 464
     iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth account_autocreate
465 465
     iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix "TEMPAUTH"
466 466
 
467
+    # Allow both reseller prefixes to be used with domain_remap
468
+    iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:domain_remap reseller_prefixes "AUTH, TEMPAUTH"
469
+
467 470
     if is_service_enabled swift3; then
468 471
         cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER}
469 472
 [filter:s3token]