Skip to content

Commit f5523b2

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "[neutron-api] remove leader_only for sb connection" into stable/yoga
2 parents de424f5 + 580027b commit f5523b2

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,8 @@ def from_server(cls, connection_string, helper):
668668
helper.register_table('Encap')
669669
helper.register_table('Port_Binding')
670670
helper.register_table('Datapath_Binding')
671-
# Used by MaintenanceWorker which can use ovsdb locking
672671
try:
673-
return cls(connection_string, helper, leader_only=True)
672+
return cls(connection_string, helper, leader_only=False)
674673
except TypeError:
675674
# TODO(twilson) We can remove this when we require ovs>=2.12.0
676675
return cls(connection_string, helper)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
[`bug 2022914 <https://bugs.launchpad.net/neutron/+bug/2022914>`_]
5+
Neutron-API supports using relays as the southbound connection in a
6+
ML2/OVN setup. Before the maintenance worker of the API required a
7+
leader_only connection, which was removed.

0 commit comments

Comments
 (0)