From 7b807eff731df8b774a017e6c8a9f6c9a7e35da7 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 17 Oct 2024 09:43:57 -0700
Subject: [PATCH] Enable GLOBAL_VENV in ironic grenade jobs

grenade by default enable GLOBAL_VENV which means it
install and run everything from virtual env

- https://review.opendev.org/c/openstack/grenade/+/930507

We faced the error in ironic grenade scripts in virtual env
so GLOBAL_VENV was disabled explicitly. This fixing the scripts
and enable GLOBAL_VENV in ironic jobs also.

Change-Id: I48ee1dd4adc2e5bcc18c5f116d979e7524248495
---
 devstack/lib/ironic         | 3 ++-
 devstack/upgrade/upgrade.sh | 2 +-
 zuul.d/ironic-jobs.yaml     | 6 ------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 6234a11435..09cb8fc80a 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1020,7 +1020,8 @@ function install_virtualbmc {
 
     local cmd
 
-    cmd=$(which vbmcd)
+    BIN_DIR=$(get_python_exec_prefix)
+    cmd=$BIN_DIR/vbmcd
     cmd+=" --foreground"
 
     write_user_unit_file $IRONIC_VBMC_SYSTEMD_SERVICE "$cmd" "" "$STACK_USER"
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index 5a2554a8ca..9cf7e402d1 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -96,7 +96,7 @@ $IRONIC_BIN_DIR/ironic-dbsync --config-file=$IRONIC_CONF_FILE
 if [[ "${HOST_TOPOLOGY}" == "multinode" ]]; then
     iniset $IRONIC_CONF_FILE DEFAULT pin_release_version ${BASE_DEVSTACK_BRANCH#*/}
 else
-    ironic-dbsync online_data_migrations
+    $IRONIC_BIN_DIR/ironic-dbsync online_data_migrations
 fi
 
 ensure_started='ironic-conductor nova-compute '
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 9df5271aed..7acc74c4d7 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -1096,9 +1096,6 @@
           # Required as different access rights are used by default
           # and the classic devstack config which is defaulted doesn't work.
           IRONIC_ENFORCE_SCOPE: True
-          # By default Grenade works on virtual env but Ironic need more work
-          # to enable it. Once Ironic is ready we can remove the below setting. 
-          GLOBAL_VENV: false
         old:
           IRONIC_VM_LOG_DIR: '{{ devstack_bases.old }}/ironic-bm-logs'
       grenade_localrc:
@@ -1207,9 +1204,6 @@
           EBTABLES_RACE_FIX: True
           LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images
           IRONIC_VM_LOG_DIR: '/opt/stack/ironic-bm-logs'
-          # By default Grenade works on virtual env but Ironic need more work
-          # to enable it. Once Ironic is ready we can remove the below setting.
-          GLOBAL_VENV: false
       grenade_localrc:
         BASE_RUN_SMOKE: False
       devstack_plugins: