From a9c8bf5c069d3324828294e3e36b5374d5a828fe Mon Sep 17 00:00:00 2001 From: maximkorezkij Date: Mon, 5 Jun 2023 11:20:47 +0200 Subject: [PATCH] [neutron-api] remove leader_only for sb connection The maintenance worker from the neutron-api uses a southbound connection. Since the southbound does not use any locking and all the ovsdb locking is used for the northbound this changes should not have a big impact. This commit removes the leader_only flag for the maintenance worker. This should also enable the neutron api to connect to relays instead of only the sb directly. Closes-Bug: #2022914 Change-Id: Ia7937390867e45af34ebcd65bd76fc89b6adafe9 Signed-off-by: maximkorezkij --- .../ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py | 3 +-- releasenotes/notes/bug-2022914-edbf1ea3514596b8.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/bug-2022914-edbf1ea3514596b8.yaml diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py index 9b0ba129aa9..e56a63ecdc7 100644 --- a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py +++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py @@ -661,9 +661,8 @@ class BaseOvnSbIdl(Ml2OvnIdlBase): helper.register_table('Encap') helper.register_table('Port_Binding') helper.register_table('Datapath_Binding') - # Used by MaintenanceWorker which can use ovsdb locking try: - return cls(connection_string, helper, leader_only=True) + return cls(connection_string, helper, leader_only=False) except TypeError: # TODO(twilson) We can remove this when we require ovs>=2.12.0 return cls(connection_string, helper) diff --git a/releasenotes/notes/bug-2022914-edbf1ea3514596b8.yaml b/releasenotes/notes/bug-2022914-edbf1ea3514596b8.yaml new file mode 100644 index 00000000000..6fa3b3a5138 --- /dev/null +++ b/releasenotes/notes/bug-2022914-edbf1ea3514596b8.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + [`bug 2022914 `_] + Neutron-API supports using relays as the southbound connection in a + ML2/OVN setup. Before the maintenance worker of the API required a + leader_only connection, which was removed.