From 23b68a02919b114c261dfa2571c01e33ee30dc3e Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:51:27 +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: If553ad33bd071792198239bc567c2e06058ebddd Partial-Bug: #1764470 --- tasks/octavia_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/octavia_install.yml b/tasks/octavia_install.yml index a8591f20..d30beec2 100644 --- a/tasks/octavia_install.yml +++ b/tasks/octavia_install.yml @@ -110,11 +110,22 @@ - not octavia_developer_mode | bool - octavia_get_venv | changed or octavia_venv_dir | 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 {{ octavia_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ octavia_bin | replace ('/','\/') }}\/python/' {{ octavia_bin }}/* - virtualenv {{ octavia_bin | dirname }} + virtualenv {{ octavia_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: - not octavia_developer_mode | bool - octavia_get_venv | changed or octavia_venv_dir | changed