From 1085b03ec5e56f1ad1b75fd0db3c618272b217fa Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:42:39 +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: Ic69473a9723df59d0a3a93fb3a8209d59fe1c6b6 Partial-Bug: #1764470 --- tasks/horizon_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/horizon_install.yml b/tasks/horizon_install.yml index 424c8545..f1bcc7b0 100644 --- a/tasks/horizon_install.yml +++ b/tasks/horizon_install.yml @@ -150,11 +150,22 @@ - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - horizon_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 {{ horizon_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ horizon_bin | replace ('/','\/') }}\/python/' {{ horizon_bin }}/* - virtualenv {{ horizon_bin | dirname }} + virtualenv {{ horizon_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: horizon_get_venv | changed tags: - skip_ansible_lint