config.yaml

@@ -1,23 +1,16 @@
 actions:
 
   - modify_release:
-    - suffix: ".alma.2"
+    - suffix: ".alma.1"
       enabled: true
 
   - changelog_entry:
       - name: "Eduard Abdullin"
         email: "eabdullin@almalinux.org"
         line:
-          - "Improvements for AlmaLinux OS and CloudLinux OS"
+          - "0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch"
-      - name: "Jonathan Wright"
-        email: "jonathan@almalinux.org"
-        line:
-          - "fix(openstack): Fix bond mac_address"
 
   - add_files:
       - type: "patch"
         name: "0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch"
         number: 100
-      - type: "patch"
-        name: "ci-fix-openstack-Fix-bond-mac_address-5369.patch"
-        number: 1000

files/ci-fix-openstack-Fix-bond-mac_address-5369.patch

@@ -1,28 +0,0 @@
-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
-