From a9561bbce96a0dc545f18aaa88be0988be2ac3ad Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 11:01:24 +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: I39e64f29e794075ef303d3e1a2c0c1a6a18937b6 Partial-Bug: #1764470 --- tasks/searchlight_install.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tasks/searchlight_install.yml b/tasks/searchlight_install.yml index fd5b5b2..312339d 100644 --- a/tasks/searchlight_install.yml +++ b/tasks/searchlight_install.yml @@ -99,12 +99,22 @@ notify: - Restart Searchlight services - +# 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 {{ searchlight_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ searchlight_bin | replace ('/','\/') }}\/python/' {{ searchlight_bin }}/* - virtualenv {{ searchlight_bin | dirname }} + virtualenv {{ searchlight_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: - not searchlight_developer_mode | bool - searchlight_get_venv | success