Synchronise 2025.1 with upstream#217
Merged
Merged
Conversation
When we added support for neutron security groups that were shared via rbac policy in epoxy the way we detected duplicate groups was implemented incorrectly. NoUniqueMatchova should reject requests by name if there are two security groups with the same name however we also reject requests when you use the uuid. That is a bug. Related-Bug: #2105896 Co-Authored-By: René Ribaud <rene.ribaud@gmail.com> Change-Id: I0e1dda07110a99daee1137d7692689a6dd274af8 Signed-off-by: René Ribaud <rene.ribaud@gmail.com> (cherry picked from commit 47ed323) (cherry picked from commit 909aa8c) (cherry picked from commit 5e0a988)
Server build fail when user give any security group and there are same name security exists in project. I fixed it occurs error when user give security group with duplicated name. NOTE(rribaud): A conflict occurred in nova/network/neutron.py because the import "from keystoneauth1 import loading as ks_loading" exists in this stable/2025.2 branch but not upstream. Closes-Bug: #2105896 Change-Id: Ie061550c6eecb51951cebd9c323f31b93b748ff5 Co-Authored-By: René Ribaud <rene.ribaud@gmail.com> Signed-off-by: cw0306-lee <cw0306.lee@samsung.com> (cherry picked from commit 96a0b17) (cherry picked from commit 556ba4c) (cherry picked from commit bf6e39e)
User-supplied scheduler hints can include internal keys like "_nova_check_type" which cause the scheduler to bypass Placement candidate selection, request pre-filters, and resource claims. This can lead to instances being created without proper resource accounting. Rather than rejecting the request, silently strip any _nova-prefixed hints before they reach the scheduler. This is consistent with the existing hints behavior of ignoring unknown ones and ensures the probe attempt still costs the attacker money. Assisted-By: Cursor Change-Id: Iac4fef93bef0bab3060d40a9ea3e0ebd69a38c37 Closes-Bug: #2151252 Signed-off-by: Sylvain Bauza <sbauza@redhat.com> (cherry picked from commit 9666894) (cherry picked from commit 32bd847) (cherry picked from commit 0e969c5)
…name" into stable/2025.1
github-actions
Bot
added
automated
priteau
approved these changes
Jun 24, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 2025.1 from upstream stable/2025.1.