@@ -53,6 +53,8 @@ HEAT_TEMPLATES_DIR=$HEAT_CONF_DIR/templates

 HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP}

 HEAT_API_PORT=${HEAT_API_PORT:-8004}

+# Support entry points installation of console scripts

+HEAT_BIN_DIR=$(get_python_exec_prefix)

 # other default options

 if [[ "$HEAT_STANDALONE" = "True" ]]; then

@@ -186,7 +188,7 @@ function init_heat {

     # (re)create heat database

     recreate_database heat

-    $HEAT_DIR/bin/heat-manage db_sync

+    $HEAT_BIN_DIR/heat-manage db_sync

     create_heat_cache_dir

 }

@@ -223,10 +225,10 @@ function install_heat_other {

 # start_heat() - Start running processes, including screen

 function start_heat {

-    run_process h-eng "$HEAT_DIR/bin/heat-engine --config-file=$HEAT_CONF"

-    run_process h-api "$HEAT_DIR/bin/heat-api --config-file=$HEAT_CONF"

-    run_process h-api-cfn "$HEAT_DIR/bin/heat-api-cfn --config-file=$HEAT_CONF"

-    run_process h-api-cw "$HEAT_DIR/bin/heat-api-cloudwatch --config-file=$HEAT_CONF"

+    run_process h-eng "$HEAT_BIN_DIR/heat-engine --config-file=$HEAT_CONF"

+    run_process h-api "$HEAT_BIN_DIR/heat-api --config-file=$HEAT_CONF"

+    run_process h-api-cfn "$HEAT_BIN_DIR/heat-api-cfn --config-file=$HEAT_CONF"

+    run_process h-api-cw "$HEAT_BIN_DIR/heat-api-cloudwatch --config-file=$HEAT_CONF"

 }

 # stop_heat() - Stop running processes