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
(cherry picked from commit 622fa8d5cf
)
This commit is contained in:
parent
9f2aa6478d
commit
3c7ca075a5
|
@ -111,11 +111,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
|
||||
|
|
Loading…
Reference in New Issue