openstack/devstack
Code Issues Proposed changes

Merge "Only create swift account if swift enabled"

Browse Source
This commit is contained in:
Jenkins 2013-07-17 17:33:07 +00:00 committed by Gerrit Code Review
commit af7edf8736
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stack.sh
View File

@ -878,10 +878,13 @@ if is_service_enabled key; then
export OS_SERVICE_ENDPOINT=$SERVICE_ENDPOINT export OS_SERVICE_ENDPOINT=$SERVICE_ENDPOINT
create_keystone_accounts create_keystone_accounts
create_nova_accounts create_nova_accounts
create_swift_accounts
create_cinder_accounts create_cinder_accounts
create_neutron_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. # ``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 \ 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 \ SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \