From 33a9f546dd557a30b6e55f092f3a223ebab841a3 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 16 Oct 2024 11:26:53 +0900
Subject: [PATCH] Enable GLOBAL_VENV

... because it is required in Ubuntu 24.04 .

Change-Id: Iba939edff0f015900ccb72c761c1e3d833805feb
(cherry picked from commit b03667a2a0f9106bad6f0179d4a0fcb15308a150)
(cherry picked from commit 51efb9f18392eaad9aa288c690ec75e842032f22)
---
 .zuul.yaml        | 1 -
 devstack/lib/heat | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 6e8d15fbcf..c89de5ba9a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -29,7 +29,6 @@
         TEMPEST_PLUGINS: '/opt/stack/heat-tempest-plugin'
         HEAT_USE_MOD_WSGI: True
         CEILOMETER_PIPELINE_INTERVAL: 60
-        GLOBAL_VENV: False
       devstack_services:
         tls-proxy: false
         s-account: false
diff --git a/devstack/lib/heat b/devstack/lib/heat
index c61e3add69..1a57e5a5e7 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -295,6 +295,10 @@ function install_heat {
            install_apache_wsgi
        fi
     fi
+    if [[ "$GLOBAL_VENV" == "True" ]] ; then
+        # TODO(tkajinam): find a better solution for this
+        sudo ln -sf $HEAT_BIN_DIR/heat-manage /usr/local/bin
+    fi
 }
 
 # start_heat() - Start running processes, including screen