commit e61bc61a31ba05c9af5d0801d2f120e919e0bd5f
author Steve Baker <sbaker@redhat.com> Mon Jan 27 15:21:29 2014 +1300
committer Steve Baker <sbaker@redhat.com> Mon Jan 27 15:21:29 2014 +1300
tree 51b61a9e68c7a0f288859e2ca427d77cde03089f
parent b53dbad8ac42417960f39bbd1f0901ffae808075

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

diff --git a/lib/heat b/lib/heat
index 0307c64..b9b8aa6 100644
--- a/lib/heat
+++ b/lib/heat
@@ -60,13 +60,13 @@
     # 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