openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Fixes the error seen in the Openstack-ansible test

Browse Source 
Also maked it  abit more clean.

Change-Id: I554955dfe36e91df1d8d73f6f04bb01462a367f4
This commit is contained in:
German Eichberger
2017-03-10 12:05:11 -05:00
parent 55204c8447
commit f15d66e2ac
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
defaults/main.yml
View File

@@ -380,7 +380,12 @@ neutron_metadata: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% els
# This complex logic activates either Namespace or Octavia or both or none; if
# Octavia is included it will be the default
neutron_lbaasv2_service_provider: "{% if neutron_lbaas_namespace | bool %}LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver{% if neutron_lbaas_octavia | bool %},{% else %}:default'{% endif %}{% endif %}{% if neutron_lbaas_octavia | bool %}LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default{% endif %}"
neutron_lbaasv2_plugin_drivers:
- "{% if neutron_lbaas_namespace | bool %}LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver{% else %}none{% endif %}"
- "{% if neutron_lbaas_octavia | bool %}LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver{% else %}none{% endif %}"
neutron_lbaasv2_service_provider: "{{ neutron_lbaasv2_plugin_drivers | reject('equalto','none') | join(',') }}{% if neutron_lbaasv2 %}:default{% endif %}"
neutron_lbaasv2_device_driver: neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver
neutron_octavia_request_poll_timeout: 100