openstack/devstack
Code Issues Proposed changes

Merge "Invoke Heat via console script generated binaries"

Browse Source
This commit is contained in:
Jenkins 2015-09-04 07:59:44 +00:00 committed by Gerrit Code Review
commit c0581ef9fd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/heat
View File

@ -53,6 +53,8 @@ HEAT_TEMPLATES_DIR=$HEAT_CONF_DIR/templates
HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP} HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP}
HEAT_API_PORT=${HEAT_API_PORT:-8004} HEAT_API_PORT=${HEAT_API_PORT:-8004}
# Support entry points installation of console scripts
HEAT_BIN_DIR=$(get_python_exec_prefix)
# other default options # other default options
if [[ "$HEAT_STANDALONE" = "True" ]]; then if [[ "$HEAT_STANDALONE" = "True" ]]; then
@ -186,7 +188,7 @@ function init_heat {
# (re)create heat database # (re)create heat database
recreate_database heat recreate_database heat
$HEAT_DIR/bin/heat-manage db_sync $HEAT_BIN_DIR/heat-manage db_sync
create_heat_cache_dir create_heat_cache_dir
} }
@ -223,10 +225,10 @@ function install_heat_other {
# start_heat() - Start running processes, including screen # start_heat() - Start running processes, including screen
function start_heat { function start_heat {
run_process h-eng "$HEAT_DIR/bin/heat-engine --config-file=$HEAT_CONF" run_process h-eng "$HEAT_BIN_DIR/heat-engine --config-file=$HEAT_CONF"
run_process h-api "$HEAT_DIR/bin/heat-api --config-file=$HEAT_CONF" run_process h-api "$HEAT_BIN_DIR/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-cfn "$HEAT_BIN_DIR/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-api-cw "$HEAT_BIN_DIR/heat-api-cloudwatch --config-file=$HEAT_CONF"
} }
# stop_heat() - Stop running processes # stop_heat() - Stop running processes