Merge "Only replace python when re-initializing the venv" into stable/queens

This commit is contained in:
Zuul 2018-04-30 06:06:06 +00:00 committed by Gerrit Code Review
commit dd85a5bd40
1 changed files with 12 additions and 1 deletions

View File

@ -121,11 +121,22 @@
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
- trove_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 {{ trove_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ trove_bin | replace ('/','\/') }}\/python/' {{ trove_bin }}/*
virtualenv {{ trove_bin | dirname }}
virtualenv {{ trove_bin | dirname }} \
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
--no-pip \
--no-setuptools \
--no-wheel
when: trove_get_venv | changed
tags:
- skip_ansible_lint