commit a44d5ed1353745258fec1a0e2c9a778d1c1f77d9
author Matthieu Huin <mhu@enovance.com> Mon Apr 08 13:31:54 2013 +0200
committer Matthieu Huin <mhu@enovance.com> Tue Apr 09 10:33:28 2013 +0200
tree 79028959f3acd00d0e79887be10fd48125d62f26
parent 954a588c93b2aa171fe3e88c478e702b34bb9cfa

Set swift3 before s3token in proxy server middleware pipeline

swift3 and s3token middlewares were not set in correct order in
/etc/swift/proxy-server.conf when the swift3 service is enabled
with keystone. swift3 must be set before s3token.

Fixes: bug #1166123
Change-Id: I97c051af95cbdc26ccfe9753c5719394e1875dde

lib/swift

diff --git a/lib/swift b/lib/swift
index eb57477..ca9c373 100644
--- a/lib/swift
+++ b/lib/swift
@@ -169,7 +169,7 @@
     # configured keystone it will configure swift with it.
     if is_service_enabled key;then
         if is_service_enabled swift3;then
-            swift_pipeline=" s3token swift3 "
+            swift_pipeline=" swift3 s3token "
         fi
         swift_pipeline+=" authtoken keystoneauth "
     else