commit 254fd552459851bf0f4ec5e721a3981e3546857f
author Chmouel Boudjnah <chmouel@enovance.com> Mon Jun 30 12:22:59 2014 +0000
committer Chmouel Boudjnah <chmouel@enovance.com> Mon Jun 30 12:42:57 2014 +0000
tree b954665236ff21003600e02e94fe637e0519148a
parent e33379658ffc97ffa82117e5dc35f6eb01bde951

Only enable auth_token in swift with keystone

We don't need to enable auth_token in pipeline when we don't have
keystone enabled.

Change-Id: I4695817766fc39fcceed32f71156d4123d5bdfa1

lib/swift

diff --git a/lib/swift b/lib/swift
index c47b09f..ae52292 100644
--- a/lib/swift
+++ b/lib/swift
@@ -354,7 +354,12 @@
     if is_service_enabled swift3;then
         swift_pipeline+=" swift3 s3token "
     fi
-    swift_pipeline+=" authtoken keystoneauth tempauth "
+
+    if is_service_enabled key;then
+        swift_pipeline+=" authtoken keystoneauth"
+    fi
+    swift_pipeline+=" tempauth "
+
     sed -i "/^pipeline/ { s/tempauth/${swift_pipeline} ${SWIFT_EXTRAS_MIDDLEWARE}/ ;}" ${SWIFT_CONFIG_PROXY_SERVER}
     sed -i "/^pipeline/ { s/proxy-server/${SWIFT_EXTRAS_MIDDLEWARE_LAST} proxy-server/ ; }" ${SWIFT_CONFIG_PROXY_SERVER}