From e721c6ae0b86d9ec2184be77cd6fa0617eb5d7db Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@dischord.org>
Date: Mon, 24 Aug 2020 20:29:47 +0100
Subject: [PATCH] Disable arp_responder option for LinuxBridge agent

Enabling both l2_population and arp_responder for LinuxBridge can cause
problems in some configurations [0].  This commit removes the explicit
'true', reverting it to the default which is 'False'.

Closes-Bug: #1892776

[0] https://bugs.launchpad.net/neutron/+bug/1661717

Change-Id: Ia9445a651fd7a082835a858964bcb9e8e325338d
Signed-off-by: Nick Jones <nick@dischord.org>
---
 ansible/roles/neutron/templates/linuxbridge_agent.ini.j2  | 1 -
 .../fix-linuxbridge-arp_responder-28068f7fe41e4e4d.yaml   | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/fix-linuxbridge-arp_responder-28068f7fe41e4e4d.yaml

diff --git a/ansible/roles/neutron/templates/linuxbridge_agent.ini.j2 b/ansible/roles/neutron/templates/linuxbridge_agent.ini.j2
index b2f2d8daed..60c5923dda 100644
--- a/ansible/roles/neutron/templates/linuxbridge_agent.ini.j2
+++ b/ansible/roles/neutron/templates/linuxbridge_agent.ini.j2
@@ -12,4 +12,3 @@ firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
 [vxlan]
 l2_population = true
 local_ip = {{ tunnel_interface_address }}
-arp_responder = true
diff --git a/releasenotes/notes/fix-linuxbridge-arp_responder-28068f7fe41e4e4d.yaml b/releasenotes/notes/fix-linuxbridge-arp_responder-28068f7fe41e4e4d.yaml
new file mode 100644
index 0000000000..5112a70466
--- /dev/null
+++ b/releasenotes/notes/fix-linuxbridge-arp_responder-28068f7fe41e4e4d.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Reverts the arp_responder option setting to the default ('False') for the
+    LinuxBridge agent, as this is known to cause problems with l2_population
+    as well as other issues such as not being fully compatible with the
+    allowed-address-pairs extension.
+    `LP#1892776 <https://bugs.launchpad.net/kolla-ansible/+bug/1892776>`__