Skip to content

Synchronise 2025.1 with upstream#274

Merged
priteau merged 2 commits into
stackhpc/2025.1from
upstream/2025.1-2026-05-11
May 11, 2026
Merged

Synchronise 2025.1 with upstream#274
priteau merged 2 commits into
stackhpc/2025.1from
upstream/2025.1-2026-05-11

Conversation

@github-actions
Copy link
Copy Markdown

This PR contains a snapshot of 2025.1 from upstream stable/2025.1.

eduolivares and others added 2 commits April 29, 2026 09:05
The empty-MAC guard in _get_port_ip4_ips_and_ip6_flag returns []
instead of the expected (list, bool) tuple. This would cause a
crash if a port with an empty MAC column were encountered during
datapath provisioning. Fix the return value to ([], False).

Conflicts:
  neutron/agent/ovn/metadata/agent.py

Closes-Bug: #2150543

Assisted-By: Claude Opus 4.6
Change-Id: Idc7d789ffe0289bf28fb289456196c307dd4a706
Signed-off-by: Eduardo Olivares <eolivare@redhat.com>
(cherry picked from commit 6f529d9)
(cherry picked from commit bd4fa33)
Neutron's Designate external DNS driver does not pass
edit_managed=True when constructing the admin designateclient.
When a floating IP has associated managed DNS records in
Designate, deleting the floating IP fails with HTTP 500 because
Designate rejects the deletion with "Managed records may not be
deleted".

Pass edit_managed=True only to the admin_client, which has admin
credentials and passes Designate's edit_managed_records policy
check. The regular user client must not set this flag because
Designate requires SYSTEM_ADMIN role for it. For forward DNS
deletion of managed records, fall back to admin_client when the
user client gets a BadRequest from Designate.

Closes-Bug: #2149807
Assisted-By: Claude Code 4.6 Opus
Change-Id: Iedf0f26708560fe063a71925d5d39542ca181154
Signed-off-by: Omer <oschwart@redhat.com>
(cherry picked from commit 44d061a)
@github-actions github-actions Bot added the automated Automated action performed by GitHub Actions label May 11, 2026
@github-actions github-actions Bot requested a review from a team as a code owner May 11, 2026 07:32
@github-actions github-actions Bot added synchronisation automated Automated action performed by GitHub Actions labels May 11, 2026
@priteau priteau closed this May 11, 2026
@priteau priteau reopened this May 11, 2026
@priteau priteau merged commit 24f944e into stackhpc/2025.1 May 11, 2026
1 check failed
@priteau priteau deleted the upstream/2025.1-2026-05-11 branch May 11, 2026 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants