Merge "Replace virtualenv-tools with a script" into stable/queens

This commit is contained in:
Zuul 2018-04-20 20:28:05 +00:00 committed by Gerrit Code Review
commit 4d177a1b51
2 changed files with 18 additions and 4 deletions

View File

@ -93,7 +93,6 @@ panko_service_in_ldap: false
# panko packages that must be installed before anything else
panko_requires_pip_packages:
- virtualenv
- virtualenv-tools
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
- httplib2

View File

@ -120,10 +120,25 @@
- ansible_pkg_mgr in ['yum', 'dnf']
- panko_get_venv | changed
- name: Update virtualenv path
command: >
virtualenv-tools --update-path=auto --reinitialize {{ panko_bin | dirname }}
# 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
shell: |
find {{ panko_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ panko_bin | replace ('/','\/') }}\/python/' {{ panko_bin }}/*
virtualenv {{ panko_bin | dirname }} \
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
--no-pip \
--no-setuptools \
--no-wheel
when: panko_get_venv | changed
tags:
- skip_ansible_lint
- name: Record the venv tag deployed
ini_file: