From 7ddbf6039dea0609b9a94f5a9404caef101eede4 Mon Sep 17 00:00:00 2001 From: Eduard Abdullin Date: Thu, 28 May 2026 13:06:37 +0000 Subject: [PATCH] Improvements for AlmaLinux OS and CloudLinux OS fix(openstack): Fix bond mac_address --- ...-openstack-Fix-bond-mac_address-5369.patch | 28 +++++++++++++++++++ SPECS/cloud-init.spec | 10 +++++-- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 SOURCES/ci-fix-openstack-Fix-bond-mac_address-5369.patch diff --git a/SOURCES/ci-fix-openstack-Fix-bond-mac_address-5369.patch b/SOURCES/ci-fix-openstack-Fix-bond-mac_address-5369.patch new file mode 100644 index 0000000..fda4563 --- /dev/null +++ b/SOURCES/ci-fix-openstack-Fix-bond-mac_address-5369.patch @@ -0,0 +1,28 @@ +From 12f1198e8e9e884363b14eeaaf6eb69b7199c36a Mon Sep 17 00:00:00 2001 +From: Curt Moore +Date: Tue, 4 Jun 2024 14:37:43 -0500 +Subject: [PATCH] fix(openstack): Fix bond mac_address (#5369) + +Fixes GH-5368 + +(cherry picked from commit 12f1198e8e9e884363b14eeaaf6eb69b7199c36a) +--- + cloudinit/sources/helpers/openstack.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py +index 094c889caef..4f86de1f883 100644 +--- a/cloudinit/sources/helpers/openstack.py ++++ b/cloudinit/sources/helpers/openstack.py +@@ -667,7 +667,7 @@ def convert_net_json(network_json=None, known_macs=None): + if link["type"] in ["bond"]: + params = {} + if link_mac_addr: +- params["mac_address"] = link_mac_addr ++ cfg.update({"mac_address": link_mac_addr}) + for k, v in link.items(): + if k == "bond_links": + continue +-- +2.45.1 + diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec index 066b824..31fa3b5 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec @@ -6,7 +6,7 @@ Name: cloud-init Version: 23.4 -Release: 7%{?dist}.11.alma.1 +Release: 7%{?dist}.11.alma.2 Summary: Cloud instance init scripts Group: System Environment/Base @@ -68,6 +68,7 @@ Patch36: ci-fix-strict-disable-in-ds-identify-on-no-datasources-.patch # AlmaLinux Patch Patch100: 0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch +Patch1000: ci-fix-openstack-Fix-bond-mac_address-5369.patch BuildArch: noarch @@ -283,8 +284,11 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog -* Fri Jan 23 2026 Eduard Abdullin - 23.4-7.11.alma.1 -- 0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch +* Thu May 28 2026 Eduard Abdullin - 23.4-7.11.alma.2 +- Improvements for AlmaLinux OS and CloudLinux OS + +* Thu May 28 2026 Jonathan Wright - 23.4-7.11.alma.2 +- fix(openstack): Fix bond mac_address * Mon Dec 15 2025 Jon Maloy - 23.4-7.el8.11 - ci-do-not-overwrite-local-changes-in-disable-sshd-keyge.patch [RHEL-128877]