From 32d46bdf88155157ac727253db0eae0ce8659256 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:48:58 +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: Id6433af376051c597aef163e916d607a36f4cfe4 Partial-Bug: #1764470 --- tasks/neutron_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml index 43d43a89..f2a50e8e 100644 --- a/tasks/neutron_install.yml +++ b/tasks/neutron_install.yml @@ -113,11 +113,22 @@ - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - neutron_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: Update virtualenv path shell: | find {{ neutron_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ neutron_bin | replace ('/','\/') }}\/python/' {{ neutron_bin }}/* - virtualenv {{ neutron_bin | dirname }} + virtualenv {{ neutron_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: neutron_get_venv | changed tags: - skip_ansible_lint