Merge "Clean up DVR conditionals"
This commit is contained in:
commit
b2d7d2fe62
@ -303,7 +303,7 @@ neutron_services:
|
||||
neutron_dhcp: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% else %}False{% endif %}"
|
||||
|
||||
## Neutron Metadata Agent
|
||||
neutron_metadata: "{% if neutron_plugin_type.split('.')[0] == 'ml2' and (neutron_plugin_type == 'ml2.ovs.dvr' or 'nova_compute' not in group_names) %}True{% else %}False{% endif %}"
|
||||
neutron_metadata: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% else %}False{% endif %}"
|
||||
|
||||
## Neutron LBaaS
|
||||
# See documentation section titled "Configuring the Network Load Balancing
|
||||
@ -322,7 +322,7 @@ neutron_lbaasv2_service_provider: LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.h
|
||||
## Please add 'router' to the neutron_plugin_base list
|
||||
#TODO(odyssey4me): Remove the class path from this conditional in the Newton cycle
|
||||
# Should the neutron-l3-agent service should be enabled on the host
|
||||
neutron_l3: "{% if ('router' in neutron_plugin_base or 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin' in neutron_plugin_base) and (neutron_plugin_type == 'ml2.ovs.dvr' or 'nova_compute' not in group_names) %}True{% else %}False{% endif %}"
|
||||
neutron_l3: "{% if 'router' in neutron_plugin_base or 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
||||
|
||||
# Set this option to "true" to enable legacy neutron L3HA tool support
|
||||
# TODO(cloudnull): Remove this in the Ocata cycle
|
||||
|
Loading…
x
Reference in New Issue
Block a user