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: I8f8f2c2eb65a7f48b901aee6506504d725f2e629 Partial-Bug: #1764470
This commit is contained in:
parent
e5229df4d5
commit
d78498a1a3
@ -111,11 +111,22 @@
|
|||||||
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
|
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
|
||||||
- cinder_get_venv | changed
|
- cinder_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: Reset virtualenv and update its paths
|
- name: Reset virtualenv and update its paths
|
||||||
shell: |
|
shell: |
|
||||||
find {{ cinder_bin }} -name \*.pyc -delete
|
find {{ cinder_bin }} -name \*.pyc -delete
|
||||||
sed -si '1s/^.*python.*$/#!{{ cinder_bin | replace ('/','\/') }}\/python/' {{ cinder_bin }}/*
|
sed -si '1s/^.*python.*$/#!{{ cinder_bin | replace ('/','\/') }}\/python/' {{ cinder_bin }}/*
|
||||||
virtualenv {{ cinder_bin | dirname }}
|
virtualenv {{ cinder_bin | dirname }} \
|
||||||
|
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
|
||||||
|
--no-pip \
|
||||||
|
--no-setuptools \
|
||||||
|
--no-wheel
|
||||||
when: cinder_get_venv | changed
|
when: cinder_get_venv | changed
|
||||||
tags:
|
tags:
|
||||||
- skip_ansible_lint
|
- skip_ansible_lint
|
||||||
|
Loading…
Reference in New Issue
Block a user