Browse code
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
Ian Wienand authored on 2013/07/17 15:30:19Showing 1 changed files
| ... | ... |
@@ -878,10 +878,13 @@ if is_service_enabled key; then |
| 878 | 878 |
export OS_SERVICE_ENDPOINT=$SERVICE_ENDPOINT |
| 879 | 879 |
create_keystone_accounts |
| 880 | 880 |
create_nova_accounts |
| 881 |
- create_swift_accounts |
|
| 882 | 881 |
create_cinder_accounts |
| 883 | 882 |
create_neutron_accounts |
| 884 | 883 |
|
| 884 |
+ if is_service_enabled swift || is_service_enabled s-proxy; then |
|
| 885 |
+ create_swift_accounts |
|
| 886 |
+ fi |
|
| 887 |
+ |
|
| 885 | 888 |
# ``keystone_data.sh`` creates services, admin and demo users, and roles. |
| 886 | 889 |
ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=$SERVICE_TENANT_NAME SERVICE_PASSWORD=$SERVICE_PASSWORD \ |
| 887 | 890 |
SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \ |