openstack
/
devstack
Code Issues Proposed changes

Merge "Use userrc_early for all nodes" into stable/newton

This commit is contained in:
Jenkins 2017-02-26 03:41:43 +00:00 committed by Gerrit Code Review
parent b34dee3730 07ad8c8ce5
commit 580979805e
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stack.sh
View File

@ -1021,15 +1021,6 @@ start_dstat
# Keystone
# --------
if is_service_enabled keystone; then
echo_summary "Starting Keystone"
if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then
init_keystone
start_keystone
bootstrap_keystone
fi
# Rather than just export these, we write them out to a
# intermediate userrc file that can also be used to debug if
# something goes wrong between here and running
@ -1057,6 +1048,15 @@ EOF
source $TOP_DIR/userrc_early
if is_service_enabled keystone; then
echo_summary "Starting Keystone"
if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then
init_keystone
start_keystone
bootstrap_keystone
fi
create_keystone_accounts
create_nova_accounts
create_glance_accounts