From 30d8fb37edb5760a62cbe5ef0efe46cfaf384b50 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 15 Oct 2024 12:42:47 -0700 Subject: [PATCH] Fix python executable file for heat: greande GLOBAL_VENV Grenade is going to install and run everything from virtual env - https://review.opendev.org/c/openstack/grenade/+/930507 Heat grenade job needs to install and run from venv. This fixes the heat bin directory locaiton otherwise it will fail with below error - https://zuul.opendev.org/t/openstack/build/9b20c32fe9594d8b963c17c9f02aa76e Needed-By: https://review.opendev.org/c/openstack/grenade/+/930507/12 Change-Id: I3a670795593da81078bb3709eedda0804871ad63 (cherry picked from commit b3bd897cc32a2fee41deaa64f704f16d70c2b3fe) (cherry picked from commit 3e4da430b02a4e4b731bbfc8a99b478f19d2dcc8) --- devstack/upgrade/upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index f73639fecd..75176e8a79 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -84,7 +84,7 @@ fi upgrade_project heat $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH # Simulate init_heat() -HEAT_BIN_DIR=$(dirname $(which heat-manage)) +HEAT_BIN_DIR=$(get_python_exec_prefix) $HEAT_BIN_DIR/heat-manage --config-file $HEAT_CONF db_sync || die $LINENO "DB sync error" # Start Heat