From f27442f2b98bfe378cf379471b0148a8c8ddf601 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 9 Nov 2016 21:34:17 +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: Ie488ed679031c53faa9256ae8ec753f37e69b26a --- tasks/neutron_install.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml index 33169fb3..16e8f441 100644 --- a/tasks/neutron_install.yml +++ b/tasks/neutron_install.yml @@ -30,7 +30,7 @@ - name: Install requires pip packages pip: - name: "{{ neutron_requires_pip_packages | join(' ') }}" + name: "{{ neutron_requires_pip_packages }}" state: "{{ neutron_pip_package_state }}" extra_args: >- {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} @@ -73,7 +73,7 @@ - name: Install pip packages pip: - name: "{{ neutron_pip_packages | join(' ') }}" + name: "{{ neutron_pip_packages }}" state: "{{ neutron_pip_package_state }}" virtualenv: "{{ neutron_bin | dirname }}" virtualenv_site_packages: "no" @@ -98,10 +98,10 @@ - name: Install optional pip packages pip: name: >- - {{ (neutron_bgp | bool) | ternary(neutron_optional_bgp_pip_packages | join(' '), '') }} - {{ (neutron_fwaas | bool) | ternary(neutron_optional_fwaas_pip_packages | join(' '), '') }} - {{ (neutron_lbaasv2 | bool) | ternary(neutron_optional_lbaas_pip_packages | join(' '), '') }} - {{ (neutron_vpnaas | bool) | ternary(neutron_optional_vpnaas_pip_packages | join(' '), '') }} + {{ (neutron_bgp | bool) | ternary(neutron_optional_bgp_pip_packages, []) + + (neutron_fwaas | bool) | ternary(neutron_optional_fwaas_pip_packages, []) + + (neutron_lbaasv2 | bool) | ternary(neutron_optional_lbaas_pip_packages, []) + + (neutron_vpnaas | bool) | ternary(neutron_optional_vpnaas_pip_packages, []) }} state: "{{ neutron_pip_package_state }}" virtualenv: "{{ neutron_bin | dirname }}" virtualenv_site_packages: "no"