Merge pull request #66 from stackhpc/upstream/yoga-2023-09-18

Synchronise yoga with upstream

Author: markgoddard

neutron/db/models/tag.py

@@ -26,6 +26,6 @@ class Tag(model_base.BASEV2):
     tag = sa.Column(sa.String(255), nullable=False, primary_key=True)
     standard_attr = orm.relationship(
         'StandardAttribute', load_on_pending=True,
-        backref=orm.backref('tags', lazy='subquery', viewonly=True),
+        backref=orm.backref('tags', lazy='joined', viewonly=True),
         sync_backref=False)
     revises_on_change = ('standard_attr', )

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

@@ -668,9 +668,8 @@ def from_server(cls, connection_string, helper):
         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)

releasenotes/notes/bug-2022914-edbf1ea3514596b8.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    [`bug 2022914 <https://bugs.launchpad.net/neutron/+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.