From 8b2fc7afc7563e475c67e95cf47a800ab2f5108c Mon Sep 17 00:00:00 2001 From: Charles Farquhar Date: Thu, 27 Jul 2017 15:51:40 -0500 Subject: [PATCH] Fix ordering of swift3 in middleware pipeline Beginning with commit 6ffcc29 of swift3, the swift3 and s3token middlewares must come between authtoken and keystoneauth in the swift proxy pipeline. When 6ffcc29 was committed, reordering was optional at the expense of an unneceessary call to keystone. However, the change becomes mandatory when using keystone v3 tokens. Without this change, authtoken will strip the necessary headers that s3token just added to the environment. Change-Id: Ic7d07d869aa617ee00190a9aedf411017539b97b --- defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 801d062b..5a615540 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -87,13 +87,13 @@ swift_middleware_list: - proxy-logging - "{% if swift_ceilometer_enabled | bool %}ceilometer{% endif %}" - cache - - "{% if swift_swift3_enabled | bool%}swift3{% endif %}" - - "{% if swift_swift3_enabled | bool%}s3token{% endif %}" - container_sync - bulk - tempurl - ratelimit - authtoken + - "{% if swift_swift3_enabled | bool%}swift3{% endif %}" + - "{% if swift_swift3_enabled | bool%}s3token{% endif %}" - keystoneauth - staticweb - copy