From 783b42c02fa8627a89fc1bc4f79a3f2660dbebf8 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 11:00:38 +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: Ie60927c5dff738c9c0bfa4325387d0d6ce57ecb8 Partial-Bug: #1764470 --- tasks/sahara_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/sahara_install.yml b/tasks/sahara_install.yml index c5e4357..7da3584 100644 --- a/tasks/sahara_install.yml +++ b/tasks/sahara_install.yml @@ -110,11 +110,22 @@ - ansible_pkg_mgr in ['yum', 'zypper'] - sahara_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 {{ sahara_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ sahara_bin | replace ('/','\/') }}\/python/' {{ sahara_bin }}/* - virtualenv {{ sahara_bin | dirname }} + virtualenv {{ sahara_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: sahara_get_venv | changed tags: - skip_ansible_lint