openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Remove join filter from pip module tasks"

Browse Source
This commit is contained in:
Jenkins 2016-11-21 04:27:00 +00:00 committed by Gerrit Code Review
commit a78ade78a8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasks/neutron_install.yml
View File

@ -30,7 +30,7 @@
- name: Install requires pip packages - name: Install requires pip packages
pip: pip:
name: "{{ neutron_requires_pip_packages | join(' ') }}" name: "{{ neutron_requires_pip_packages }}"
state: "{{ neutron_pip_package_state }}" state: "{{ neutron_pip_package_state }}"
extra_args: >- extra_args: >-
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
@ -73,7 +73,7 @@
- name: Install pip packages - name: Install pip packages
pip: pip:
name: "{{ neutron_pip_packages | join(' ') }}" name: "{{ neutron_pip_packages }}"
state: "{{ neutron_pip_package_state }}" state: "{{ neutron_pip_package_state }}"
virtualenv: "{{ neutron_bin | dirname }}" virtualenv: "{{ neutron_bin | dirname }}"
virtualenv_site_packages: "no" virtualenv_site_packages: "no"
@ -98,10 +98,10 @@
- name: Install optional pip packages - name: Install optional pip packages
pip: pip:
name: >- name: >-
{{ (neutron_bgp | bool) | ternary(neutron_optional_bgp_pip_packages | join(' '), '') }} {{ (neutron_bgp | bool) | ternary(neutron_optional_bgp_pip_packages, []) +
{{ (neutron_fwaas | bool) | ternary(neutron_optional_fwaas_pip_packages | join(' '), '') }} (neutron_fwaas | bool) | ternary(neutron_optional_fwaas_pip_packages, []) +
{{ (neutron_lbaasv2 | bool) | ternary(neutron_optional_lbaas_pip_packages | join(' '), '') }} (neutron_lbaasv2 | bool) | ternary(neutron_optional_lbaas_pip_packages, []) +
{{ (neutron_vpnaas | bool) | ternary(neutron_optional_vpnaas_pip_packages | join(' '), '') }} (neutron_vpnaas | bool) | ternary(neutron_optional_vpnaas_pip_packages, []) }}
state: "{{ neutron_pip_package_state }}" state: "{{ neutron_pip_package_state }}"
virtualenv: "{{ neutron_bin | dirname }}" virtualenv: "{{ neutron_bin | dirname }}"
virtualenv_site_packages: "no" virtualenv_site_packages: "no"