commit 5ce44cd63b6e2b53f08a6b4b87cb4ab11d1ade26
author Dean Troyer <dtroyer@gmail.com> Thu Feb 12 22:18:33 2015 -0600
committer Dean Troyer <dtroyer@gmail.com> Mon Feb 16 10:52:18 2015 -0600
tree 5f396699c97e2df46b99bc46443f1db9bc3d7955
parent 2b564763aafe6466f42bc5cf2ccc47ddf4169986

Fix is_keystone_enabled()

is_keystone_enabled() was calling is_service_enabled(), which is what called
is_keystone_enabled() in the first place.  Make it work as designed and
also change calls to use the full service name.  Note that this is all
still comptible with the prior usage of 'is_service_enabled key'.

Change-Id: I9c28377ecf074b7996461d2a4ca12d88dfc4d47e

lib/swift

diff --git a/lib/swift b/lib/swift
index e4d8b5f..2bb6422 100644
--- a/lib/swift
+++ b/lib/swift
@@ -393,7 +393,7 @@
         swift_pipeline+=" swift3 s3token "
     fi
 
-    if is_service_enabled key;then
+    if is_service_enabled keystone; then
         swift_pipeline+=" authtoken keystoneauth"
     fi
     swift_pipeline+=" tempauth "
@@ -498,7 +498,7 @@
     iniset ${testfile} func_test password4 testing4
     iniset ${testfile} func_test domain4 swift_test
 
-    if is_service_enabled key;then
+    if is_service_enabled keystone; then
         iniuncomment ${testfile} func_test auth_version
         local auth_vers=$(iniget ${testfile} func_test auth_version)
         iniset ${testfile} func_test auth_host ${KEYSTONE_SERVICE_HOST}