openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Updates for virtualenv on debian bullseye"

This commit is contained in:
Zuul 2022-07-04 02:14:34 +00:00 committed by Gerrit Code Review
parent 0caa358b49 b5b3160ef1
commit 12d4eec7dc
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
View File

@ -3,7 +3,15 @@ set -eux
manifest=$(get-pip-manifest os-apply-config)
virtualenv --setuptools $OS_APPLY_CONFIG_VENV_DIR
env | sort
if [[ "$DISTRO_NAME" == "debian" ]] && [[ "$DIB_RELEASE" == "stable" || "$DIB_RELEASE" == "bullseye" ]]
then
virtualenv $OS_APPLY_CONFIG_VENV_DIR
else
virtualenv --setuptools $OS_APPLY_CONFIG_VENV_DIR
fi
set +u
source $OS_APPLY_CONFIG_VENV_DIR/bin/activate
set -u

8
elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
View File

@ -3,7 +3,13 @@ set -eux
manifest=$(get-pip-manifest os-collect-config)
virtualenv --setuptools $OS_COLLECT_CONFIG_VENV_DIR
if [[ "$DISTRO_NAME" == "debian" ]] && [[ "$DIB_RELEASE" == "stable" || "$DIB_RELEASE" == "bullseye" ]]
then
virtualenv $OS_COLLECT_CONFIG_VENV_DIR
else
virtualenv --setuptools $OS_COLLECT_CONFIG_VENV_DIR
fi
set +u
source $OS_COLLECT_CONFIG_VENV_DIR/bin/activate
set -u

8
elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source
View File

@ -3,7 +3,13 @@ set -ex
manifest=$(get-pip-manifest os-net-config)
virtualenv --setuptools $OS_NET_CONFIG_VENV_DIR
if [[ "$DISTRO_NAME" == "debian" ]] && [[ "$DIB_RELEASE" == "stable" || "$DIB_RELEASE" == "bullseye" ]]
then
virtualenv $OS_NET_CONFIG_VENV_DIR
else
virtualenv --setuptools $OS_NET_CONFIG_VENV_DIR
fi
set +u
source $OS_NET_CONFIG_VENV_DIR/bin/activate
set -u

8
elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
View File

@ -8,7 +8,13 @@ manifest=$(get-pip-manifest os-refresh-config)
# pip and virtualenv is installed by the pip-and-virtualenv element
virtualenv --setuptools /opt/stack/venvs/os-refresh-config
if [[ "$DISTRO_NAME" == "debian" ]] && [[ "$DIB_RELEASE" == "stable" || "$DIB_RELEASE" == "bullseye" ]]
then
virtualenv /opt/stack/venvs/os-refresh-config
else
virtualenv --setuptools /opt/stack/venvs/os-refresh-config
fi
set +u
source /opt/stack/venvs/os-refresh-config/bin/activate
set -u