From 90a92f5eca7a186d35b2c6f1ab7c334f55e605a1 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:43:41 +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: I34958aa7c965a161b7699115d5602b94dc68beac Partial-Bug: #1764470 --- tasks/ironic_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/ironic_install.yml b/tasks/ironic_install.yml index 76aeabba..c1957758 100644 --- a/tasks/ironic_install.yml +++ b/tasks/ironic_install.yml @@ -108,11 +108,22 @@ - ansible_pkg_mgr in ['yum', 'zypper'] - ironic_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 {{ ironic_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ ironic_bin | replace ('/','\/') }}\/python/' {{ ironic_bin }}/* - virtualenv {{ ironic_bin | dirname }} + virtualenv {{ ironic_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: ironic_get_venv | changed tags: - skip_ansible_lint