Merge "Fix devstack plugin for multinode deployment issues" into stable/ocata

This commit is contained in:
Jenkins 2017-08-17 02:56:51 +00:00 committed by Gerrit Code Review
commit 3dea08592d
2 changed files with 4 additions and 5 deletions

View File

@ -127,7 +127,9 @@ function configure_heat {
iniset $HEAT_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1/waitcondition
iniset $HEAT_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT
iniset $HEAT_CONF database connection `database_connection_url heat`
iniset $HEAT_CONF DEFAULT auth_encryption_key $(generate_hex_string 16)
# we are using a hardcoded auth_encryption_key as it has to be the same for
# multinode deployment.
iniset $HEAT_CONF DEFAULT auth_encryption_key "767c3ed056cbaa3b9dfedb8c6f825bf0"
iniset $HEAT_CONF DEFAULT region_name_for_services "$REGION_NAME"

View File

@ -21,10 +21,7 @@ if is_heat_enabled; then
cleanup_heat
echo_summary "Configuring heat"
configure_heat
if is_service_enabled key; then
create_heat_accounts
fi
create_heat_accounts
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
# Initialize heat