Set GLOBAL_VENV to false for centos and rocky
As a temporary workaround, let's set the GLOBAL_VENV to false specifically for centos 9 stream and rocky distros where we encountered issues after changing the default value of GLOBAL_VENV to True in Devstack: https://review.opendev.org/c/openstack/devstack/+/558930 Related-Bug: #2031639 Change-Id: I708b5a81c32b0bd650dcd63a51e16346863a6fc0
This commit is contained in:
parent
bd472fd53d
commit
7cd3a8eebe
|
@ -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
|
||||
|
|
11
stackrc
11
stackrc
|
@ -188,9 +188,18 @@ ENFORCE_SCOPE=$(trueorfalse False ENFORCE_SCOPE)
|
|||
# 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.
|
||||
|
|
Loading…
Reference in New Issue