From 828218215b75ba378cd255d29367494d24a70135 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 10:25:48 +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: I3c589dd4c105bb247f06479d3881ffd68e699224 Partial-Bug: #1764470 (cherry picked from commit 07d9cc32bed99f4f7613d5f7f296f9c4a60313ed) --- tasks/ceilometer_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/ceilometer_install.yml b/tasks/ceilometer_install.yml index 090c9c0c..d5647369 100644 --- a/tasks/ceilometer_install.yml +++ b/tasks/ceilometer_install.yml @@ -124,11 +124,22 @@ - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - ceilometer_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 {{ ceilometer_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ ceilometer_bin | replace ('/','\/') }}\/python/' {{ ceilometer_bin }}/* - virtualenv {{ ceilometer_bin | dirname }} + virtualenv {{ ceilometer_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: ceilometer_get_venv | changed tags: - skip_ansible_lint