From 826fd12a11bac3f03602de0c1e53f9e08c787d6c Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Wed, 23 Nov 2022 13:16:59 +0000
Subject: [PATCH] Revert "Generate ovn-chassis-mac-mappings on ovn-controller
 group"

This reverts commit 8bf8656dbad3def707eca2d8ddd2c9bfed389b86.

Reason for revert: Setting ovn-chassis-mac-mappings on network nodes
is causing mac flooding [1] [2] for traffic between external ports,
and very slow troughput in consequence.
OVN HA Chassis priorities between gateways should probably be managed
by Neutron [3]

[1] https://mail.openvswitch.org/pipermail/ovs-discuss/2020-September/050691.html
[2] https://mail.openvswitch.org/pipermail/ovs-discuss/2022-May/051837.html
[3] https://mail.openvswitch.org/pipermail/ovs-discuss/2022-October/052068.html

Change-Id: Ia3b279d7e2c08464fda1a5dc41518296f559e93f
---
 ansible/roles/ovn/tasks/bootstrap.yml                | 2 +-
 releasenotes/notes/bug-1995078-2671a868c4fd27d3.yaml | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 releasenotes/notes/bug-1995078-2671a868c4fd27d3.yaml

diff --git a/ansible/roles/ovn/tasks/bootstrap.yml b/ansible/roles/ovn/tasks/bootstrap.yml
index 3e6065919e..7c2fb0f14a 100644
--- a/ansible/roles/ovn/tasks/bootstrap.yml
+++ b/ansible/roles/ovn/tasks/bootstrap.yml
@@ -34,6 +34,6 @@
     - { name: ovn-remote-probe-interval, value: "{{ ovn_remote_probe_interval }}" }
     - { name: ovn-openflow-probe-interval, value: "{{ ovn_openflow_probe_interval }}" }
     - { name: ovn-bridge-mappings, value: "{{ ovn_mappings }}", state: "{{ 'present' if (inventory_hostname in groups['ovn-controller-network'] or computes_need_external_bridge | bool) else 'absent' }}" }
-    - { name: ovn-chassis-mac-mappings, value: "{{ ovn_macs }}", state: "{{ 'present' if inventory_hostname in groups['ovn-controller'] else 'absent' }}" }
+    - { name: ovn-chassis-mac-mappings, value: "{{ ovn_macs }}", state: "{{ 'present' if inventory_hostname in groups['ovn-controller-compute'] else 'absent' }}" }
     - { name: ovn-cms-options, value: "{{ ovn_cms_opts }}", state: "{{ 'present' if ovn_cms_opts != '' else 'absent' }}" }
   when: inventory_hostname in groups.get('ovn-controller', [])
diff --git a/releasenotes/notes/bug-1995078-2671a868c4fd27d3.yaml b/releasenotes/notes/bug-1995078-2671a868c4fd27d3.yaml
deleted file mode 100644
index e0955dfe80..0000000000
--- a/releasenotes/notes/bug-1995078-2671a868c4fd27d3.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-fixes:
-  - |
-    Fixes ``ovn-chassis-mac-mappings`` missing on network nodes.
-    Previously ``ovn-chassis-mac-mappings`` has been added only to
-    ``ovn-controller-compute`` group. However external ports are being
-    scheduled on network nodes. Adding ``ovn-chassis-mac-mappings``
-    on whole ``ovn-controller`` group fixes the bug.
-    `LP#1995078 <https://launchpad.net/bugs/1995078>`__
-- 
GitLab