Synchronise yoga with upstream #17
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Since OVN 20.06 [1], the OVN configuration is stored in "Chassis.other_config". Since OVN 22.09, the "Chassis" configuration stored in "Chassis.other_config" will not be replicated to "Chassis.external_ids". The ML2/OVN plugin tries to retrieve the "Chassis" configuration from the "other_config" field first; if this field does not exist (in OVN versions before 20.06), the plugin will use "external_ids" field instead. Neutron will be compatible with the different OVN versions (with and without "other_config" field). [1]ovn-org/ovn@74d90c2 [2]ovn-org/ovn@5130942 NOTE: this patch is similar to [1], but in this case neutron keeps compatibility with the different OVN versions (with and without "other_config" field). Since [2], the Neutron CI has a new job that uses the OVN/OVS packages distributed by the operating system installed by the CI (in this case, Ubuntu 20.04 and OVN 20.03). [1]https://review.opendev.org/c/openstack/neutron/+/859642 [2]https://review.opendev.org/c/openstack/neutron/+/860636 conflicting files in cherry pick: - neutron/tests/functional/base.py - neutron/tests/functional/services/ovn_l3/test_plugin.py Closes-Bug: #1990229 Change-Id: I54c8fd4d065ae537f396408df16832b158ee8998 (cherry picked from commit 536498a)
Since the train release neutron adds routes with protocol static. Keepalived also adds the same routes with different protocols depending on the keepalived version. This can result in duplicated routes inside network namespaces. On l3 agent restarts those duplicate routes then prevent the l3 agent from updating its router state because it runs into 'RTNETLINK answers: File exists expections' when it tries to execute 'ip route' commands. This patch adds the same protocol static to each virtual route of keepalived's configuration so network namespaces do not run into duplicated routes anymore. Closes-Bug: #1956846 Change-Id: Ic35b5d4b9110b832c10345c45ec62c0923237cfd (cherry picked from commit c813b65)
A corner case of the fix done in [1] could happend if, as a race scenario, parallel requests evaluate other ports that could be deleted during the process if they had already determined a overlapping, in that case a RouterInterfaceNotFound exception was raised and the request finished with that exception and a 404 status code. This patch removes the exception due to a port not found, because if the port is not found, the related subnet should not participate in the overlap evaluation, so it makes no sense to break the process for a port that no longer exists. It also improves the previous validation to perform the overlapping check, being performed only when we have at least more than one subnet, as the overlapping check with only one subnet did not make sense. Closes-Bug: #1998226 [1] https://review.opendev.org/c/openstack/neutron/+/859143 Change-Id: If4afe6f525c46f9cf7f02d8aae27dfc56144fd62 (cherry picked from commit 92efd8e)
github-actions
bot
added
automated
markgoddard
approved these changes
Dec 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of yoga from upstream.