commit 7bc5220493e1278042f31aa43c822dc90a8f050c
author Zuul <zuul@review.opendev.org> Wed Aug 21 17:34:47 2019 +0000
committer Gerrit Code Review <review@openstack.org> Wed Aug 21 17:34:47 2019 +0000
tree 5451ce81613acd03e889e51a9fd1524b522e7ed0
parent 03f94cc40308978ac608f24ae111acad79cf7ed4
parent 9bf7e2654124205cd71343c2af175d730c634ab7

Merge "DVR-Enable ARP Responder when DVR and L2pop is enabled"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 0d23d97..9c05c85 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -251,6 +251,7 @@
             if [[ "$NEUTRON_DISTRIBUTED_ROUTING" = "True" ]]; then
                 iniset $NEUTRON_CORE_PLUGIN_CONF agent l2_population True
                 iniset $NEUTRON_CORE_PLUGIN_CONF agent enable_distributed_routing True
+                iniset $NEUTRON_CORE_PLUGIN_CONF agent arp_responder True
             fi
         fi
 

lib/neutron_plugins/ml2

diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2
index 127d46b..497b6c6 100644
--- a/lib/neutron_plugins/ml2
+++ b/lib/neutron_plugins/ml2
@@ -147,6 +147,7 @@
         populate_ml2_config /$Q_PLUGIN_CONF_FILE agent l2_population=True
         populate_ml2_config /$Q_PLUGIN_CONF_FILE agent tunnel_types=vxlan
         populate_ml2_config /$Q_PLUGIN_CONF_FILE agent enable_distributed_routing=True
+        populate_ml2_config /$Q_PLUGIN_CONF_FILE agent arp_responder=True
     fi
 }