Merge "Fix glance-remote with global venv"
diff --git a/.zuul.yaml b/.zuul.yaml
index e65dc5b..8b60fc9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -708,9 +708,6 @@
nodeset: devstack-single-node-centos-9-stream
timeout: 9000
voting: false
- vars:
- devstack_localrc:
- GLOBAL_VENV: false
- job:
name: devstack-platform-debian-bookworm
@@ -745,8 +742,6 @@
timeout: 9000
vars:
configure_swap_size: 4096
- devstack_localrc:
- GLOBAL_VENV: false
- job:
name: devstack-platform-ubuntu-focal
diff --git a/stackrc b/stackrc
index 2d25e37..ff30d37 100644
--- a/stackrc
+++ b/stackrc
@@ -188,9 +188,18 @@
# Note that the DATA_DIR is selected because grenade testing uses a shared
# DATA_DIR but different DEST dirs and we don't want two sets of venvs,
# instead we want one global set.
-GLOBAL_VENV=$(trueorfalse True GLOBAL_VENV)
DEVSTACK_VENV=${DEVSTACK_VENV:-$DATA_DIR/venv}
+# NOTE(kopecmartin): remove this once this is fixed
+# https://bugs.launchpad.net/devstack/+bug/2031639
+# This couldn't go to fixup_stuff as that's called after projects
+# (e.g. certain paths) are set taking GLOBAL_VENV into account
+if [[ "$os_VENDOR" =~ (CentOSStream|Rocky) ]]; then
+ GLOBAL_VENV=$(trueorfalse False GLOBAL_VENV)
+else
+ GLOBAL_VENV=$(trueorfalse True GLOBAL_VENV)
+fi
+
# Enable use of Python virtual environments. Individual project use of
# venvs are controlled by the PROJECT_VENV array; every project with
# an entry in the array will be installed into the named venv.