openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Replace virtualenv-tools by a script

Browse Source 
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-02-13 21:50:44 +00:00
parent 782c27cf60
commit 7b16d80ca3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -258,7 +258,6 @@ cinder_service_in_ldap: false
# Cinder packages that must be installed before anything else # Cinder packages that must be installed before anything else
cinder_requires_pip_packages: cinder_requires_pip_packages:
- virtualenv - virtualenv
- virtualenv-tools
- python-keystoneclient # Keystoneclient needed by the keystone Ansible module - python-keystoneclient # Keystoneclient needed by the keystone Ansible module
- httplib2 - httplib2

10
tasks/cinder_install.yml
View File

@ -111,10 +111,14 @@
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
- cinder_get_venv | changed - cinder_get_venv | changed
- name: Update virtualenv path - name: Reset virtualenv and update its paths
command: > shell: |
virtualenv-tools --update-path=auto --reinitialize {{ cinder_bin | dirname }} find {{ cinder_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ cinder_bin | replace ('/','\/') }}\/python/' {{ cinder_bin }}/*
virtualenv {{ cinder_bin | dirname }}
when: cinder_get_venv | changed when: cinder_get_venv | changed
tags:
- skip_ansible_lint
- name: Initialise the upgrade facts - name: Initialise the upgrade facts
ini_file: ini_file: