From 9a71107491208dc24b1877562367fa0211eb5043 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 7 Dec 2018 18:34:54 -0500 Subject: [PATCH] Fix virtualenv_package_name for Debian We actually also need to install the virtualenv package, for the binary. Change-Id: Ic7a90e27f243a6ec1d94d10c86ef7960323e142d Signed-off-by: Paul Belanger --- defaults/main.yaml | 2 -- tasks/install/package.yaml | 5 +++++ vars/Debian.yaml | 4 ++++ vars/RedHat.yaml | 3 +++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 15cd7f2..6cb56a2 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -23,8 +23,6 @@ virtualenv_git_version: master virtualenv_install_method: pip -virtualenv_package_name: python3-virtualenv - virtualenv_pip_name: virtualenv #virtualenv_pip_extra_args: #virtualenv_pip_version: diff --git a/tasks/install/package.yaml b/tasks/install/package.yaml index 8a44767..56d8f3b 100644 --- a/tasks/install/package.yaml +++ b/tasks/install/package.yaml @@ -12,6 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. --- +- name: Define virtualenv_package_name + set_fact: + virtualenv_package_name: "{{ __virtualenv_package_name | list }}" + when: virtualenv_package_name is not defined + - name: Install virtualenv from package become: yes package: diff --git a/vars/Debian.yaml b/vars/Debian.yaml index 75ea2fc..4c9f307 100644 --- a/vars/Debian.yaml +++ b/vars/Debian.yaml @@ -27,3 +27,7 @@ --- __virtualenv_build_depends: - git + +__virtualenv_package_name: + - python3-virtualenv + - virtualenv diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml index 0faebd6..23428f0 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -14,3 +14,6 @@ --- __virtualenv_build_depends: - git + +__virtualenv_package_name: + - python3-virtualenv