Merge "Allow both Keystone and Tempauth reseller prefixes"

2017-09-12 08:55:31 +00:00 · 2017-09-12 08:55:31 +00:00 · dbd32d1bc4
commit dbd32d1bc4
parent 91f62818c3 59fb961180
1 changed files with 3 additions and 0 deletions
--- a/lib/swift
+++ b/lib/swift
@ -464,6 +464,9 @@ function configure_swift {
    iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth account_autocreate
    iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix "TEMPAUTH"

+    # Allow both reseller prefixes to be used with domain_remap
+    iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:domain_remap reseller_prefixes "AUTH, TEMPAUTH"
+
    if is_service_enabled swift3; then
        cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER}
 [filter:s3token]