rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity

Improvements for AlmaLinux OS and CloudLinux OS

Browse Source 
fix(openstack): Fix bond mac_address
This commit is contained in:
Eduard Abdullin 2026-05-28 13:06:37 +00:00 committed by root
parent fa2191e032
commit 7ddbf6039d
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SOURCES/ci-fix-openstack-Fix-bond-mac_address-5369.patch Normal file
View File

@ -0,0 +1,28 @@
From 12f1198e8e9e884363b14eeaaf6eb69b7199c36a Mon Sep 17 00:00:00 2001
From: Curt Moore <curt.moore@garmin.com>
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

10
SPECS/cloud-init.spec
View File

@ -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 <eabdullin@almalinux.org> - 23.4-7.11.alma.1
- 0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
* Thu May 28 2026 Eduard Abdullin <eabdullin@almalinux.org> - 23.4-7.11.alma.2
- Improvements for AlmaLinux OS and CloudLinux OS
* Thu May 28 2026 Jonathan Wright <jonathan@almalinux.org> - 23.4-7.11.alma.2
- fix(openstack): Fix bond mac_address
* Mon Dec 15 2025 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8.11
- ci-do-not-overwrite-local-changes-in-disable-sshd-keyge.patch [RHEL-128877]