From bf7e349e5d93e0f5f6a6e3bebe8ae8cc4e5da684 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: I06b22225177c8c57995601d1ab39245965f66150 Partial-Bug: #1741634 --- defaults/main.yml | 1 - tasks/tacker_install.yml | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 8d53e88..a9d51ce 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -107,7 +107,6 @@ tacker_service_in_ldap: false # packages that must be installed before anything else tacker_requires_pip_packages: - virtualenv - - virtualenv-tools - python-keystoneclient # Keystoneclient needed to OSA keystone lib ## Common pip packages diff --git a/tasks/tacker_install.yml b/tasks/tacker_install.yml index f004df6..e276c62 100644 --- a/tasks/tacker_install.yml +++ b/tasks/tacker_install.yml @@ -132,8 +132,11 @@ - skip_ansible_lint - name: Update virtualenv path - command: > - virtualenv-tools --update-path=auto {{ tacker_bin | dirname }} + shell: | + find {{ tacker_bin }} -name \*.pyc -delete + sed -si '1s/^.*python.*$/#!{{ tacker_bin | replace ('/','\/') }}\/python/' {{ tacker_bin }}/* + tags: + - skip_ansible_lint when: - not tacker_developer_mode | bool - tacker_get_venv | success