openstack/devstack
Code Issues Proposed changes

Merge "Use userrc_early for all nodes"

Browse Source
This commit is contained in:
Jenkins
2016-11-07 23:41:30 +00:00
committed by Gerrit Code Review
parent 8c7cec52d0 a5d965a3d7
commit 4972bbcfbe
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
stack.sh
View File

@@ -1025,21 +1025,12 @@ start_dstat
# Keystone # Keystone
# -------- # --------
if is_service_enabled keystone; then # Rather than just export these, we write them out to a
echo_summary "Starting Keystone" # intermediate userrc file that can also be used to debug if
# something goes wrong between here and running
if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then # tools/create_userrc.sh (this script relies on services other
init_keystone # than keystone being available, so we can't call it right now)
start_keystone cat > $TOP_DIR/userrc_early <<EOF
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
# tools/create_userrc.sh (this script relies on services other
# than keystone being available, so we can't call it right now)
cat > $TOP_DIR/userrc_early <<EOF
# Use this for debugging issues before files in accrc are created # Use this for debugging issues before files in accrc are created
# Set up password auth credentials now that Keystone is bootstrapped # Set up password auth credentials now that Keystone is bootstrapped
@@ -1054,12 +1045,21 @@ export OS_REGION_NAME=$KEYSTONE_REGION_NAME
EOF EOF
if is_service_enabled tls-proxy; then if is_service_enabled tls-proxy; then
echo "export OS_CACERT=$INT_CA_DIR/ca-chain.pem" >> $TOP_DIR/userrc_early echo "export OS_CACERT=$INT_CA_DIR/ca-chain.pem" >> $TOP_DIR/userrc_early
start_tls_proxy http-services '*' 443 $SERVICE_HOST 80 start_tls_proxy http-services '*' 443 $SERVICE_HOST 80
fi fi
source $TOP_DIR/userrc_early 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_keystone_accounts
create_nova_accounts create_nova_accounts