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

This commit is contained in:
Zuul 2018-04-30 04:35:49 +00:00 committed by Gerrit Code Review
commit 6951b1af6e
2 changed files with 18 additions and 4 deletions

View File

@ -260,7 +260,6 @@ monasca_requires_pip_packages:
- python-keystoneclient
- python-monascaclient
- virtualenv
- virtualenv-tools
monasca_pip_packages:
- cassandra-driver

View File

@ -113,7 +113,22 @@
- ansible_pkg_mgr == 'yum'
- monasca_get_venv | changed
- name: Update virtualenv path
command: >
virtualenv-tools --update-path=auto --reinitialize {{ monasca_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 {{ monasca_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ monasca_bin | replace ('/','\/') }}\/python/' {{ monasca_bin }}/*
virtualenv {{ monasca_bin | dirname }} \
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
--no-pip \
--no-setuptools \
--no-wheel
when: monasca_get_venv | changed
tags:
- skip_ansible_lint