From c63ddb06523fd974699b7951251d74e206e1c6b2 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 9 Nov 2016 21:34:28 +0000 Subject: [PATCH] Remove join filter from pip module tasks Ansible 2.2 now treats the 'name' argument for the pip module as a list, removing the need for us to implement the join filter to optimise the install execution. Change-Id: I5daf0a42537ca659d7c43b0aae4e0596e82398fc --- tasks/nova_compute_kvm_install.yml | 2 +- tasks/nova_compute_lxd_install.yml | 2 +- tasks/nova_compute_powervm_install.yml | 2 +- tasks/nova_console_novnc_install.yml | 2 +- tasks/nova_install.yml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/nova_compute_kvm_install.yml b/tasks/nova_compute_kvm_install.yml index b946a2f8..5d562f3e 100644 --- a/tasks/nova_compute_kvm_install.yml +++ b/tasks/nova_compute_kvm_install.yml @@ -48,7 +48,7 @@ - name: Install pip packages pip: - name: "{{ nova_compute_pip_packages | join(' ') }}" + name: "{{ nova_compute_pip_packages }}" state: "{{ nova_pip_package_state }}" virtualenv: "{{ nova_bin | dirname }}" virtualenv_site_packages: "no" diff --git a/tasks/nova_compute_lxd_install.yml b/tasks/nova_compute_lxd_install.yml index 4479ac81..0db2644b 100644 --- a/tasks/nova_compute_lxd_install.yml +++ b/tasks/nova_compute_lxd_install.yml @@ -15,7 +15,7 @@ - name: Install pip packages (venv) pip: - name: "{{ nova_compute_lxd_pip_packages | join(' ') }}" + name: "{{ nova_compute_lxd_pip_packages }}" state: "{{ nova_pip_package_state }}" virtualenv: "{{ nova_bin | dirname }}" virtualenv_site_packages: "no" diff --git a/tasks/nova_compute_powervm_install.yml b/tasks/nova_compute_powervm_install.yml index 29d538cd..22f50895 100644 --- a/tasks/nova_compute_powervm_install.yml +++ b/tasks/nova_compute_powervm_install.yml @@ -70,7 +70,7 @@ - name: Install pip packages pip: - name: "{{ nova_compute_powervm_pip_packages | join(' ') }}" + name: "{{ nova_compute_powervm_pip_packages }}" state: "{{ nova_pip_package_state }}" virtualenv: "{{ nova_bin | dirname }}" virtualenv_site_packages: "no" diff --git a/tasks/nova_console_novnc_install.yml b/tasks/nova_console_novnc_install.yml index 238ddcac..0b216bfe 100644 --- a/tasks/nova_console_novnc_install.yml +++ b/tasks/nova_console_novnc_install.yml @@ -40,7 +40,7 @@ - name: Install pip packages pip: - name: "{{ nova_novnc_pip_packages | join(' ') }}" + name: "{{ nova_novnc_pip_packages }}" state: "{{ nova_pip_package_state }}" virtualenv: "{{ nova_bin | dirname }}" virtualenv_site_packages: "no" diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml index 94b42fc5..d9b6db8e 100644 --- a/tasks/nova_install.yml +++ b/tasks/nova_install.yml @@ -30,7 +30,7 @@ - name: Install requires pip packages pip: - name: "{{ nova_requires_pip_packages | join(' ') }}" + name: "{{ nova_requires_pip_packages }}" state: "{{ nova_pip_package_state }}" extra_args: >- {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} @@ -87,7 +87,7 @@ - name: Install pip packages pip: - name: "{{ nova_pip_packages | join(' ') }}" + name: "{{ nova_pip_packages }}" state: "{{ nova_pip_package_state }}" virtualenv: "{{ nova_bin | dirname }}" virtualenv_site_packages: "no"