From e61bc61a31ba05c9af5d0801d2f120e919e0bd5f Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 27 Jan 2014 15:21:29 +1300 Subject: [PATCH] Use HOST_IP instead of SERVICE_HOST for heat API conf Heat config values heat_metadata_server_url, heat_waitcondition_server_url and heat_waitcondition_server_url currently derive their host from devstack SERVICE_HOST. In gating this is set to 127.0.0.1, which would explain why nova servers are not reaching heat with waitcondition signalling. This change uses HOST_IP as the default instead of SERVICE_HOST. Change-Id: I373b086e3a36a3484cfd34f0d1c8c168ac6d465d --- lib/heat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/heat b/lib/heat index 0307c64ae1..b9b8aa66ca 100644 --- a/lib/heat +++ b/lib/heat @@ -60,13 +60,13 @@ function configure_heat() { # remove old config files rm -f $HEAT_CONF_DIR/heat-*.conf - HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$SERVICE_HOST} + HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$HOST_IP} HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000} HEAT_ENGINE_HOST=${HEAT_ENGINE_HOST:-$SERVICE_HOST} HEAT_ENGINE_PORT=${HEAT_ENGINE_PORT:-8001} - HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$SERVICE_HOST} + HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$HOST_IP} HEAT_API_CW_PORT=${HEAT_API_CW_PORT:-8003} - HEAT_API_HOST=${HEAT_API_HOST:-$SERVICE_HOST} + HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP} HEAT_API_PORT=${HEAT_API_PORT:-8004} HEAT_API_PASTE_FILE=$HEAT_CONF_DIR/api-paste.ini HEAT_POLICY_FILE=$HEAT_CONF_DIR/policy.json