commit 0ff314c01dc1184fc443a85f4110615f32ec8d90
author Ian Wienand <iwienand@redhat.com> Wed Jul 17 16:30:19 2013 +1000
committer Ian Wienand <iwienand@redhat.com> Wed Jul 17 21:01:43 2013 +1000
tree e981698b9c1bc6569af8c5e42f4368c0b4b3f00c
parent 7ad51b4a473ae464ca10bfac8aa6a6461a7c70cb

Only create swift account if swift enabled

Only call the swift account creation function if swift is enabled,
otherwise the endpoints are created in keystone even though swift
isn't running.

This causes failures when tempest queries keystone and thinks swift is
there; it starts running tests against it that fail with unhelpful
"connection refused" errors.

Change-Id: Icf08409c9443ec703e5f1da4531aa34c326f3642

stack.sh

diff --git a/stack.sh b/stack.sh
index f2054d9..0a5e1ee 100755
--- a/stack.sh
+++ b/stack.sh
@@ -878,10 +878,13 @@
     export OS_SERVICE_ENDPOINT=$SERVICE_ENDPOINT
     create_keystone_accounts
     create_nova_accounts
-    create_swift_accounts
     create_cinder_accounts
     create_neutron_accounts
 
+    if is_service_enabled swift || is_service_enabled s-proxy; then
+        create_swift_accounts
+    fi
+
     # ``keystone_data.sh`` creates services, admin and demo users, and roles.
     ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=$SERVICE_TENANT_NAME SERVICE_PASSWORD=$SERVICE_PASSWORD \
     SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \