openstack/devstack
Code Issues Proposed changes

Use userrc_early for all nodes

Browse Source 
Instead of only using the userrc_early when keystone
is an enabled service we will do it on all runs of
stack.sh. This way services can be split up more
across devstack nodes, and you can do configuration
requiring credentials on nodes that don't install
keystone.

Change-Id: I74574ae9f45a74bcbcc8e3149228ecb795ab4fb7
This commit is contained in:
Patrick East 2016-08-03 14:44:53 -07:00
parent a2d1848419
commit a5d965a3d7
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
stack.sh
View File

@ -1021,21 +1021,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
@ -1050,12 +1041,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