From 835920782fb48c4a750814fedd04126424334856 Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Wed, 10 Feb 2021 12:57:14 +0300
Subject: [PATCH] Correctly configure S3 Token Middleware for Swift

According the documentation [1] there need to configure auth_uri in the
[filter:s3token] section instead of www_authenticate_uri which cause an
error 'swift.common.wsgi.ConfigFileError: Invalid auth_uri; must
include scheme and host' during start the swift-proxy-server container.

1. https://docs.openstack.org/swift/ussuri/middleware.html#s3-token-middleware

Change-Id: I6b8f5807ebb746428a501dca13eae30763dede8d
Closes-Bug: 1862765
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
---
 ansible/roles/swift/templates/proxy-server.conf.j2   | 2 +-
 releasenotes/notes/bug-1862765-a6cad9fd2d3f0f48.yaml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/bug-1862765-a6cad9fd2d3f0f48.yaml

diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2
index 280ae890aa..90dab06112 100644
--- a/ansible/roles/swift/templates/proxy-server.conf.j2
+++ b/ansible/roles/swift/templates/proxy-server.conf.j2
@@ -99,5 +99,5 @@ use = egg:swift#s3api
 
 [filter:s3token]
 use = egg:swift#s3token
-www_authenticate_uri = {{ keystone_internal_url }}/v3
+auth_uri = {{ keystone_internal_url }}/v3
 {% endif %}
diff --git a/releasenotes/notes/bug-1862765-a6cad9fd2d3f0f48.yaml b/releasenotes/notes/bug-1862765-a6cad9fd2d3f0f48.yaml
new file mode 100644
index 0000000000..52f899dbc0
--- /dev/null
+++ b/releasenotes/notes/bug-1862765-a6cad9fd2d3f0f48.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix the issue when Swift deployed with S3 Token Middleware enabled.
+    Fixes `LP#1862765 <https://bugs.launchpad.net/kolla-ansible/+bug/1862765>`__