openstack/heat
Code Issues Proposed changes

Revert "Fix devstack plugin" workaround

Browse Source 
This reverts the workaround for the devstack plugin,
as now the gate jobs pass(with the plugin and no devstack
tree heat code) and make it only a devstack plugin.

Change-Id: Ia8d88eca2dec301b692bbef3e1d8988f00e1936a
Depends-On: I5b60422bf1f5fa78aa8f3383f7a222e0356d9e42
This commit is contained in:
rabi 2016-08-27 08:30:32 +05:30
parent 4078e228dd
commit bebe21ae13
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devstack/lib/heat
View File

@ -240,13 +240,8 @@ function configure_heat {
[ $err_count -eq 0 ] || die $LINENO "$err_count of the requested Heat plugins could not be installed."
}
# dummy function called by stack.sh, remove it once moved to plugin
function init_heat {
:
}
# init_heat() - Initialize database
function init_heat_with_plugin {
function init_heat {
# (re)create heat database
recreate_database heat
@ -284,13 +279,8 @@ function install_heat_other {
:
}
# dummy function called by stack.sh, remove it once moved to plugin
function start_heat {
:
}
# start_heat() - Start running processes, including screen
function start_heat_with_plugin {
function start_heat {
run_process h-eng "$HEAT_BIN_DIR/heat-engine --config-file=$HEAT_CONF"
# If the site is not enabled then we are in a grenade scenario
@ -392,13 +382,8 @@ function _config_heat_apache_wsgi {
}
# dummy function called by stack.sh, remove it once moved to plugin
function create_heat_accounts {
:
}
# create_heat_accounts() - Set up common required heat accounts
function create_heat_accounts_with_plugin {
function create_heat_accounts {
if [[ "$HEAT_STANDALONE" != "True" ]]; then
create_service_user "heat" "admin"

6
devstack/plugin.sh
View File

@ -23,16 +23,16 @@ if is_heat_enabled; then
configure_heat
if is_service_enabled key; then
create_heat_accounts_with_plugin
create_heat_accounts
fi
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
# Initialize heat
init_heat_with_plugin
init_heat
# Start the heat API and heat taskmgr components
echo_summary "Starting heat"
start_heat_with_plugin
start_heat
fi
if [[ "$1" == "unstack" ]]; then

2
devstack/upgrade/upgrade.sh
View File

@ -82,7 +82,7 @@ HEAT_BIN_DIR=$(dirname $(which heat-manage))
$HEAT_BIN_DIR/heat-manage --config-file $HEAT_CONF db_sync || die $LINENO "DB sync error"
# Start Heat
start_heat_with_plugin
start_heat
# Don't succeed unless the services come up
ensure_services_started heat-api heat-engine heat-api-cloudwatch heat-api-cfn