diff --git a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config index 3ce92db84..aa045d4ce 100755 --- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config +++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config @@ -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 diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config index c849408a5..3d3fe102c 100755 --- a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config +++ b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config @@ -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 diff --git a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source index d438df713..e865ebd57 100755 --- a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source +++ b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source @@ -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 diff --git a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config index 52d7f88b8..a9c81976a 100755 --- a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config +++ b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config @@ -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