openstack/heat
Code Issues Proposed changes

devstack: Use global uwsgi

Browse Source 
... following the global method.

Closes-Bug: #2126581
Change-Id: Ie4b2c73bb6364917d260d2ae9947fdf4802f346d
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-10-04 11:52:30 +09:00
parent 7ffb5dd3c2
commit eddcbd93c1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/heat
View File

@@ -256,7 +256,6 @@ function install_heatclient {
# install_heat() - Collect source and prepare # install_heat() - Collect source and prepare
function install_heat { function install_heat {
setup_develop $HEAT_DIR setup_develop $HEAT_DIR
pip_install uwsgi
if [[ "$GLOBAL_VENV" == "True" ]] ; then if [[ "$GLOBAL_VENV" == "True" ]] ; then
# TODO(tkajinam): find a better solution for this # TODO(tkajinam): find a better solution for this
sudo ln -sf $HEAT_BIN_DIR/heat-manage /usr/local/bin sudo ln -sf $HEAT_BIN_DIR/heat-manage /usr/local/bin
@@ -268,8 +267,8 @@ function start_heat {
run_process h-eng "$HEAT_BIN_DIR/heat-engine --config-file=$HEAT_CONF" 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 # If the site is not enabled then we are in a grenade scenario
run_process h-api "$HEAT_BIN_DIR/uwsgi --ini $HEAT_API_UWSGI_CONF" "" run_process h-api "$(which uwsgi) --ini $HEAT_API_UWSGI_CONF" ""
run_process h-api-cfn "$HEAT_BIN_DIR/uwsgi --ini $HEAT_CFN_API_UWSGI_CONF" "" run_process h-api-cfn "$(which uwsgi) --ini $HEAT_CFN_API_UWSGI_CONF" ""
} }
# stop_heat() - Stop running processes # stop_heat() - Stop running processes