1. devstack
  2. Commit e61bc61a31ba05c9af5d0801d2f120e919e0bd5f
Browse code

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

Steve Baker authored on 2014/01/27 11:21:29
Showing 1 changed files
lib/heat
History View file @ e61bc61
... ... 
@@ -60,13 +60,13 @@ function configure_heat() {
60 60 
     # remove old config files
61 61 
     rm -f $HEAT_CONF_DIR/heat-*.conf
62 62
63 
-    HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$SERVICE_HOST}
63 
+    HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$HOST_IP}
64 64 
     HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000}
65 65 
     HEAT_ENGINE_HOST=${HEAT_ENGINE_HOST:-$SERVICE_HOST}
66 66 
     HEAT_ENGINE_PORT=${HEAT_ENGINE_PORT:-8001}
67 
-    HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$SERVICE_HOST}
67 
+    HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$HOST_IP}
68 68 
     HEAT_API_CW_PORT=${HEAT_API_CW_PORT:-8003}
69 
-    HEAT_API_HOST=${HEAT_API_HOST:-$SERVICE_HOST}
69 
+    HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP}
70 70 
     HEAT_API_PORT=${HEAT_API_PORT:-8004}
71 71 
     HEAT_API_PASTE_FILE=$HEAT_CONF_DIR/api-paste.ini
72 72 
     HEAT_POLICY_FILE=$HEAT_CONF_DIR/policy.json