From 46c78a10c161ff04b2a9f5bc251408f7906303b8 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Wed, 29 Jan 2020 18:31:33 +0100 Subject: [PATCH] Use correct command for Python virtualenv Using the virtualenv command will generate a virtualenv with the default python exec for the entire system, that means that even if DIB_PYTHON is python3, the virtualenv will use python2. With this change we use the venv embedded command if the version of Python is 3.x to generate a virtualenv with the correct Python 3 version. Change-Id: I8bec32c5e0dae2dee27615146f946a9649f23fd1 --- .../60-ironic-python-agent-ramdisk-install | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install b/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install index e19445d..cc1e444 100755 --- a/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install +++ b/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install @@ -14,7 +14,11 @@ UPPER_CONSTRAINTS=/tmp/requirements/upper-constraints.txt VENVDIR=/opt/ironic-python-agent # create the virtual environment using the default python -$DIB_PYTHON -m virtualenv -- $VENVDIR +if [ $DIB_PYTHON_VERSION == 3 ]; then + $DIB_PYTHON -m venv $VENVDIR +else + $DIB_PYTHON -m virtualenv $VENVDIR +fi # pip might be an older version which does not support the -c option, therefore upgrade first $VENVDIR/bin/pip install pip --upgrade