From 60d085e78053a70f8d9ed05ead5dfaac13887c08 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:30:47 +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: I02e4f0bff6e3ee6bead20223ae082c0ed7d6a6e5 Partial-Bug: #1764470 --- tasks/designate_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/designate_install.yml b/tasks/designate_install.yml index f28574d..546b694 100644 --- a/tasks/designate_install.yml +++ b/tasks/designate_install.yml @@ -111,11 +111,22 @@ - not designate_developer_mode | bool - designate_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 {{ designate_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ designate_bin | replace ('/','\/') }}\/python/' {{ designate_bin }}/* - virtualenv {{ designate_bin | dirname }} + virtualenv {{ designate_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: designate_get_venv | changed tags: - skip_ansible_lint