From e2810f4427563591d85b11bb38a89018130b0f0c 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: I5c8b8d102829e84179f94e10a7464008ac5753c4 Partial-Bug: #1741634 --- defaults/main.yml | 1 - tasks/sahara_install.yml | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f7f7bba..e130355 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -146,7 +146,6 @@ sahara_service_in_ldap: False # Sahara packages that must be installed before anything else sahara_requires_pip_packages: - virtualenv - - virtualenv-tools - python-keystoneclient # Keystoneclient needed to OSA keystone lib - httplib2 diff --git a/tasks/sahara_install.yml b/tasks/sahara_install.yml index fe2bc47..5e8c941 100644 --- a/tasks/sahara_install.yml +++ b/tasks/sahara_install.yml @@ -111,9 +111,12 @@ - sahara_get_venv | changed - name: Update virtualenv path - command: > - virtualenv-tools --update-path=auto --reinitialize {{ sahara_bin | dirname }} + shell: | + find {{ sahara_bin }} -name \*.pyc -delete + sed -si '1s/^.*python.*$/#!{{ sahara_bin | replace ('/','\/') }}\/python/' {{ sahara_bin }}/* when: sahara_get_venv | changed + tags: + - skip_ansible_lint - name: Record the venv tag deployed ini_file: