@@ -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 \