From d78498a1a3a538d6af7bc94356dec0aa11cd6102 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:26:52 +0100 Subject: [PATCH] Only replace python when re-initializing the venv We reinitialize the venv to ensure that the right version of python is in the venv, but we do not want virtualenv to also replace pip, setuptools and wheel so we tell it not to. If we don't do this then virtualenv will install the latest available version, which is not what we want. Change-Id: I8f8f2c2eb65a7f48b901aee6506504d725f2e629 Partial-Bug: #1764470 --- tasks/cinder_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/cinder_install.yml b/tasks/cinder_install.yml index 653bff77..c07add08 100644 --- a/tasks/cinder_install.yml +++ b/tasks/cinder_install.yml @@ -111,11 +111,22 @@ - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - cinder_get_venv | changed +# NOTE(odyssey4me): +# We reinitialize the venv to ensure that the right +# version of python is in the venv, but we do not +# want virtualenv to also replace pip, setuptools +# and wheel so we tell it not to. +# We do not use --always-copy for CentOS/SuSE due +# to https://github.com/pypa/virtualenv/issues/565 - name: Reset virtualenv and update its paths shell: | find {{ cinder_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ cinder_bin | replace ('/','\/') }}\/python/' {{ cinder_bin }}/* - virtualenv {{ cinder_bin | dirname }} + virtualenv {{ cinder_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: cinder_get_venv | changed tags: - skip_ansible_lint