From eddcbd93c1da4c711864010b9f335fa4b75efd7a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 4 Oct 2025 11:52:30 +0900 Subject: [PATCH] devstack: Use global uwsgi ... following the global method. Closes-Bug: #2126581 Change-Id: Ie4b2c73bb6364917d260d2ae9947fdf4802f346d Signed-off-by: Takashi Kajinami --- devstack/lib/heat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index 90510d5af6..4d73b11429 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -256,7 +256,6 @@ function install_heatclient { # install_heat() - Collect source and prepare function install_heat { setup_develop $HEAT_DIR - pip_install uwsgi if [[ "$GLOBAL_VENV" == "True" ]] ; then # TODO(tkajinam): find a better solution for this 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" # 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-cfn "$HEAT_BIN_DIR/uwsgi --ini $HEAT_CFN_API_UWSGI_CONF" "" + run_process h-api "$(which uwsgi) --ini $HEAT_API_UWSGI_CONF" "" + run_process h-api-cfn "$(which uwsgi) --ini $HEAT_CFN_API_UWSGI_CONF" "" } # stop_heat() - Stop running processes