From 622fa8d5cfb5ea5d220a69333f7a0c74b41e22fd Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:18:23 +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: Iefe83a8b6002f423503c11f860a2f85f555a2f0a Partial-Bug: #1764470 --- tasks/glance_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml index 32507803..4ac18181 100644 --- a/tasks/glance_install.yml +++ b/tasks/glance_install.yml @@ -181,11 +181,22 @@ - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - glance_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 {{ glance_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ glance_bin | replace ('/','\/') }}\/python/' {{ glance_bin }}/* - virtualenv {{ glance_bin | dirname }} + virtualenv {{ glance_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: glance_get_venv | changed tags: - skip_ansible_lint