commit af7edf8736f9705b1b97c2225a52079e7713a7da
author Jenkins <jenkins@review.openstack.org> Wed Jul 17 17:33:07 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 17 17:33:07 2013 +0000
tree 12ccc2ea6395be7f81743acea532f33ae708c51a
parent 50300856d8c344651aa5e667e1217d2033999495
parent 0ff314c01dc1184fc443a85f4110615f32ec8d90

Merge "Only create swift account if swift enabled"

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 \