From 0ff314c01dc1184fc443a85f4110615f32ec8d90 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 17 Jul 2013 16:30:19 +1000
Subject: [PATCH] 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/stack.sh b/stack.sh
index f2054d93eb..0a5e1eea09 100755
--- a/stack.sh
+++ b/stack.sh
@@ -878,10 +878,13 @@ if is_service_enabled key; then
     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 \