From a686b93020ee8ab6dae364864dcb45ffb7255307 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:50:16 +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: I5f7e8fd36185537543d0741d88a5ccc9cd1f1645 Partial-Bug: #1764470 --- tasks/nova_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml index e0ce55c1..4eff4295 100644 --- a/tasks/nova_install.yml +++ b/tasks/nova_install.yml @@ -155,11 +155,22 @@ - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - nova_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 {{ nova_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ nova_bin | replace ('/','\/') }}\/python/' {{ nova_bin }}/* - virtualenv {{ nova_bin | dirname }} + virtualenv {{ nova_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: - nova_get_venv | changed tags: