From 6681a1f12651d7ee3930051e905d305042c93363 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 26 May 2020 20:11:24 -0700
Subject: [PATCH] swift: Configure s3token appropriately

We need an appropriate auth_uri for s3token to be able to contact
Keystone.

Since tempauth is always enabled, we want to delay the auth decision
until after tempauth has had a chance to try.

Change-Id: Ie4ff33a617b9dc74d51d037ec8ebd0d9787dd76d
---
 lib/swift | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/swift b/lib/swift
index b6c06c57bd..3c121ca6ec 100644
--- a/lib/swift
+++ b/lib/swift
@@ -431,6 +431,8 @@ function configure_swift {
         swift_pipeline+=" authtoken"
         if is_service_enabled s3api;then
             swift_pipeline+=" s3token"
+            iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:s3token auth_uri ${KEYSTONE_AUTH_URI_V3}
+            iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:s3token delay_auth_decision true
         fi
         swift_pipeline+=" keystoneauth"
     fi