Replace virtualenv-tools by a script

virtualenv-tools has a bug which gets triggered in gates: it can't
change the shebang of a virtualenv python bin/ files if they
were generated with a virtualenv script whose shebang ends with
python2 instead of python.

Because we can't modify virtualenv-tools, we use shell scripts
instead.

Change-Id: I6cc40b4fc473df29c6e3d7844fde6340694d43bb
Partial-Bug: #1741634
This commit is contained in:
Jean-Philippe Evrard 2018-01-15 13:54:00 +00:00
parent 9e90689c28
commit 4e2dddf278
2 changed files with 6 additions and 3 deletions

View File

@ -219,7 +219,6 @@ glance_service_in_ldap: false
# Cinder packages that must be installed before anything else
glance_requires_pip_packages:
- virtualenv
- virtualenv-tools
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
- httplib2

View File

@ -112,9 +112,13 @@
- glance_get_venv | changed
- name: Update virtualenv path
command: >
virtualenv-tools --update-path=auto --reinitialize {{ glance_bin | dirname }}
shell: |
find {{ glance_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ glance_bin | replace ('/','\/') }}\/python/' {{ glance_bin }}/*
virtualenv {{ glance_bin | dirname }}
when: glance_get_venv | changed
tags:
- skip_ansible_lint
- name: Record the need for a service restart
ini_file: