From 82d06176db121ec02bd65549307ed392763929aa Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Mon, 15 Jan 2018 13:54:00 +0000 Subject: [PATCH] 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: I068bef7dcf354349a576ddf3dd3438f6489ffc4a Partial-Bug: #1741634 --- defaults/main.yml | 1 - tasks/ironic_install.yml | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index eb744ffd..f980a560 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -212,7 +212,6 @@ ironic_tftp_server_address: "{{ ansible_host }}" ironic_requires_pip_packages: - virtualenv - - virtualenv-tools - python-keystoneclient # Keystoneclient needed for the OSA keystone lib - httplib2 # for Ansible's uri module diff --git a/tasks/ironic_install.yml b/tasks/ironic_install.yml index 647e0df5..b4a3a7c1 100644 --- a/tasks/ironic_install.yml +++ b/tasks/ironic_install.yml @@ -109,9 +109,12 @@ - ironic_get_venv | changed - name: Update virtualenv path - command: > - virtualenv-tools --update-path=auto --reinitialize {{ ironic_bin | dirname }} + shell: | + find {{ ironic_bin }} -name \*.pyc -delete + sed -si '1s/^.*python.*$/#!{{ ironic_bin | replace ('/','\/') }}\/python/' {{ ironic_bin }}/* when: ironic_get_venv | changed + tags: + - skip_ansible_lint - name: Record the venv tag deployed ini_file: