l3 agent on network_hosts do dvr_snat, anywhere else dvr

With the change in queens of moving the neutron agents from
containers onto the network_hosts, if those hosts happen to
also be your nova_computes, VM's without a floating ip would
lose north/south network.

Checking for physical_host_group could make this patch work for
neutron_agents_containers on pike aswell, if we want to
backport it that far.

Depends-on: https://review.opendev.org/#/c/693809/1
Depends-on: https://review.opendev.org/#/c/698009/1
Change-Id: I6bb24a8719b3902d6f510c70705cdb63076a1a08
Signed-off-by: Erik Berg <openstack@slipsprogrammor.no>
(cherry picked from commit edf0a25ca2e78658f06a2394a4ded60b49232bca)
This commit is contained in:
Erik Berg 2019-08-08 10:37:40 +02:00 committed by Georgina Shippey
parent a8ae259cbd
commit 5b0f6574e3

View File

@ -178,7 +178,7 @@ neutron_plugins:
drivers_type: "{{ neutron_ml2_drivers_type }}"
l2_population: "{{ neutron_l2_population }}"
mechanisms: "openvswitch"
l3_agent_mode: "{% if 'nova_compute' in group_names %}dvr{% else %}dvr_snat{% endif %}"
l3_agent_mode: "{% if 'network_hosts' in group_names %}dvr_snat{% else %}dvr{% endif %}"
router_distributed: True
plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}"
plugin_core: ml2