Skip to content

Synchronise yoga with upstream #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 18, 2023
Merged

Synchronise yoga with upstream #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
580027b
[neutron-api] remove leader_only for sb connection
Jun 5, 2023
f5523b2
Merge "[neutron-api] remove leader_only for sb connection" into stabl…
Sep 12, 2023
ef31c17
Use HasStandardAttributes as parent class for Tags DB model
slawqo Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion neutron/db/models/tag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', )
3 changes: 1 addition & 2 deletions neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions releasenotes/notes/bug-2022914-edbf1ea3514596b8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.