commit 0a9ebfc04c1a6dd276843c45f0087c52b4fb38d3
author Jenkins <jenkins@review.openstack.org> Wed Sep 13 14:05:55 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 13 14:05:55 2017 +0000
tree 444fd2dd80258f10d7c2b3dd837fffa97917a48c
parent dbd32d1bc486d7008ba256ac3ca40844d1947e43
parent 941940a92cd5424bbe5125569b083f1059569bdb

Merge "Add etcd3 support for s390x"

lib/swift

diff --git a/lib/swift b/lib/swift
index 3b87610..5277cde 100644
--- a/lib/swift
+++ b/lib/swift
@@ -464,6 +464,9 @@
     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]