From 2a2040f1e4f23529aac0610940c852e96d5c04e0 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Thu, 25 Jun 2026 08:29:10 -0400 Subject: [PATCH] import CS git cloud-init-24.4-7.el10_2.1 --- ...est_cloudstack.py-since-pytest-fixtu.patch | 14 +++++----- ...face-string-to-get_newest_lease-6648.patch | 14 +++++----- ...mprove-domain-name-DHCP-lease-lookup.patch | 16 +++++------ cloud-init.spec | 28 +++++++++---------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ci-downstream-fix-test_cloudstack.py-since-pytest-fixtu.patch b/ci-downstream-fix-test_cloudstack.py-since-pytest-fixtu.patch index 44cb18c..2a74b1e 100644 --- a/ci-downstream-fix-test_cloudstack.py-since-pytest-fixtu.patch +++ b/ci-downstream-fix-test_cloudstack.py-since-pytest-fixtu.patch @@ -1,15 +1,15 @@ -From c96e5802145fd0c7e0d939b335f1abe953643063 Mon Sep 17 00:00:00 2001 +From 0c0b91bb94308c97514cd0464c0911f7c4b1ddbc Mon Sep 17 00:00:00 2001 From: Ani Sinha Date: Mon, 23 Mar 2026 13:50:11 +0530 -Subject: [PATCH 3/3] downstream: fix test_cloudstack.py since pytest fixtures +Subject: [PATCH 4/4] downstream: fix test_cloudstack.py since pytest fixtures cannot be used RH-Author: Ani Sinha -RH-MergeRequest: 178: fix(cloudstack): Improve domain-name DHCP lease lookup -RH-Jira: RHEL-159032 -RH-Acked-by: Emanuele Giuseppe Esposito +RH-MergeRequest: 135: fix(cloudstack): Improve domain-name DHCP lease lookup +RH-Jira: RHEL-159033 RH-Acked-by: xiachen -RH-Commit: [3/3] 0c7a39a2ee00228bfbd5de87d95e08d0d9c32101 +RH-Acked-by: Miroslav Rezanina +RH-Commit: [3/3] af3ac74a3a2389d1a989571f124c76d33ad264e8 (anisinha/cloud-init) pytest.mark.parametrize decorator cannot be used for functions inside classes that are derived from unittest.TestCase[1]. Here, the test class is derived @@ -32,7 +32,7 @@ Signed-off-by: Ani Sinha 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/tests/unittests/sources/test_cloudstack.py b/tests/unittests/sources/test_cloudstack.py -index 0f987066..f3b08a47 100644 +index 0f9870665..f3b08a475 100644 --- a/tests/unittests/sources/test_cloudstack.py +++ b/tests/unittests/sources/test_cloudstack.py @@ -328,31 +328,34 @@ class TestCloudStackHostname(CiTestCase): diff --git a/ci-fix-Pass-interface-string-to-get_newest_lease-6648.patch b/ci-fix-Pass-interface-string-to-get_newest_lease-6648.patch index 756f8cf..1bd1976 100644 --- a/ci-fix-Pass-interface-string-to-get_newest_lease-6648.patch +++ b/ci-fix-Pass-interface-string-to-get_newest_lease-6648.patch @@ -1,14 +1,14 @@ -From c016e0c7521f45e343874e8df6da857be64c5ea7 Mon Sep 17 00:00:00 2001 +From 20a3d2274134fa7336b3803882004e2f70a756de Mon Sep 17 00:00:00 2001 From: Leah <76408777+goldberl@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:01:59 -0500 -Subject: [PATCH 1/3] fix: Pass interface string to get_newest_lease() (#6648) +Subject: [PATCH 2/4] fix: Pass interface string to get_newest_lease() (#6648) RH-Author: Ani Sinha -RH-MergeRequest: 178: fix(cloudstack): Improve domain-name DHCP lease lookup -RH-Jira: RHEL-159032 -RH-Acked-by: Emanuele Giuseppe Esposito +RH-MergeRequest: 135: fix(cloudstack): Improve domain-name DHCP lease lookup +RH-Jira: RHEL-159033 RH-Acked-by: xiachen -RH-Commit: [1/3] a5eb297936e0253fc93e9ba4808af8d5636eb285 +RH-Acked-by: Miroslav Rezanina +RH-Commit: [1/3] 5f74c14b51432facb96647410ed6a6ec52c99935 (anisinha/cloud-init) In DataSourceCloudStack.py, get_newest_lease() is currently being passed a Distro object, causing a Python type error. This PR @@ -21,7 +21,7 @@ Signed-off-by: Ani Sinha 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py -index 61bf94f5..6d19077c 100644 +index 61bf94f51..6d19077cd 100644 --- a/cloudinit/sources/DataSourceCloudStack.py +++ b/cloudinit/sources/DataSourceCloudStack.py @@ -314,7 +314,9 @@ def get_vr_address(distro): diff --git a/ci-fix-cloudstack-Improve-domain-name-DHCP-lease-lookup.patch b/ci-fix-cloudstack-Improve-domain-name-DHCP-lease-lookup.patch index d770c1e..2cf4777 100644 --- a/ci-fix-cloudstack-Improve-domain-name-DHCP-lease-lookup.patch +++ b/ci-fix-cloudstack-Improve-domain-name-DHCP-lease-lookup.patch @@ -1,15 +1,15 @@ -From d45780e65158d7f9b0a00933f8998934f5ceb4cf Mon Sep 17 00:00:00 2001 +From 5b771aa7ba9853f17a051348d0a5ce3e9b945d9f Mon Sep 17 00:00:00 2001 From: CodeBleu <400979+CodeBleu@users.noreply.github.com> Date: Tue, 20 Jan 2026 13:52:54 -0500 -Subject: [PATCH 2/3] fix(cloudstack): Improve domain-name DHCP lease lookup +Subject: [PATCH 3/4] fix(cloudstack): Improve domain-name DHCP lease lookup (Cloudstack) (#6554) RH-Author: Ani Sinha -RH-MergeRequest: 178: fix(cloudstack): Improve domain-name DHCP lease lookup -RH-Jira: RHEL-159032 -RH-Acked-by: Emanuele Giuseppe Esposito +RH-MergeRequest: 135: fix(cloudstack): Improve domain-name DHCP lease lookup +RH-Jira: RHEL-159033 RH-Acked-by: xiachen -RH-Commit: [2/3] 5f3c7dac734ddcc068f086866963d05c42e0c24f +RH-Acked-by: Miroslav Rezanina +RH-Commit: [2/3] f9e1f775d40bd402eb10e3e74a4e88045a48036d (anisinha/cloud-init) * Adding case-insensitive options for systemd-networkd leases ("DOMAINNAME", "Domain", "domain-name"). * Falling back gracefully from systemd leases to ISC dhclient leases. @@ -24,7 +24,7 @@ Signed-off-by: Ani Sinha 2 files changed, 53 insertions(+), 24 deletions(-) diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py -index 6d19077c..98189c23 100644 +index 6d19077cd..98189c23c 100644 --- a/cloudinit/sources/DataSourceCloudStack.py +++ b/cloudinit/sources/DataSourceCloudStack.py @@ -23,6 +23,7 @@ from cloudinit import sources, subp @@ -108,7 +108,7 @@ index 6d19077c..98189c23 100644 def get_hostname( self, diff --git a/tests/unittests/sources/test_cloudstack.py b/tests/unittests/sources/test_cloudstack.py -index a64d80f3..0f987066 100644 +index a64d80f37..0f9870665 100644 --- a/tests/unittests/sources/test_cloudstack.py +++ b/tests/unittests/sources/test_cloudstack.py @@ -1,5 +1,6 @@ diff --git a/cloud-init.spec b/cloud-init.spec index 7ca6093..0ab26cd 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -6,7 +6,7 @@ Name: cloud-init Version: 24.4 -Release: 6%{?dist}.2 +Release: 7%{?dist}.1 Summary: Cloud instance init scripts License: Apache-2.0 OR GPL-3.0-only URL: https://github.com/canonical/cloud-init @@ -32,11 +32,11 @@ Patch11: ci-feat-aliyun-datasource-support-crawl-metadata-at-onc.patch Patch12: ci-fix-Don-t-attempt-to-identify-non-x86-OpenStack-inst.patch # For RHEL-100617 - CVE-2024-6174 cloud-init: From CVEorg collector [rhel-10.1] Patch13: ci-fix-strict-disable-in-ds-identify-on-no-datasources-.patch -# For RHEL-159032 - [GSS][Secure Support] [RHEL-10] cloud-init requests lease before DHCP can provide one [rhel-10.1.z] +# For RHEL-159033 - [GSS][Secure Support] [RHEL-10] cloud-init requests lease before DHCP can provide one [rhel-10.2.z] Patch14: ci-fix-Pass-interface-string-to-get_newest_lease-6648.patch -# For RHEL-159032 - [GSS][Secure Support] [RHEL-10] cloud-init requests lease before DHCP can provide one [rhel-10.1.z] +# For RHEL-159033 - [GSS][Secure Support] [RHEL-10] cloud-init requests lease before DHCP can provide one [rhel-10.2.z] Patch15: ci-fix-cloudstack-Improve-domain-name-DHCP-lease-lookup.patch -# For RHEL-159032 - [GSS][Secure Support] [RHEL-10] cloud-init requests lease before DHCP can provide one [rhel-10.1.z] +# For RHEL-159033 - [GSS][Secure Support] [RHEL-10] cloud-init requests lease before DHCP can provide one [rhel-10.2.z] Patch16: ci-downstream-fix-test_cloudstack.py-since-pytest-fixtu.patch BuildArch: noarch @@ -243,17 +243,17 @@ fi %changelog -* Thu Mar 26 2026 Miroslav Rezanina - 24.4-6.el10_1.2 -- ci-fix-Pass-interface-string-to-get_newest_lease-6648.patch [RHEL-159032] -- ci-fix-cloudstack-Improve-domain-name-DHCP-lease-lookup.patch [RHEL-159032] -- ci-downstream-fix-test_cloudstack.py-since-pytest-fixtu.patch [RHEL-159032] -- Resolves: RHEL-159032 - ([GSS][Secure Support] [RHEL-10] cloud-init requests lease before DHCP can provide one [rhel-10.1.z]) +* Tue Apr 07 2026 Miroslav Rezanina - 24.4-7.el10_2.1 +- ci-fix-Pass-interface-string-to-get_newest_lease-6648.patch [RHEL-159033] +- ci-fix-cloudstack-Improve-domain-name-DHCP-lease-lookup.patch [RHEL-159033] +- ci-downstream-fix-test_cloudstack.py-since-pytest-fixtu.patch [RHEL-159033] +- Resolves: RHEL-159033 + ([GSS][Secure Support] [RHEL-10] cloud-init requests lease before DHCP can provide one [rhel-10.2.z]) -* Wed Dec 10 2025 Miroslav Rezanina - 24.4-6.el10_1.1 -- ci-downstream-Do-not-override-changes-in-disable-sshd-k.patch [RHEL-128905] -- Resolves: RHEL-128905 - ([rhel-10] cloud-init upgrade is overwriting modifications in disable-sshd-keygen-if-cloud-init-active.conf [rhel-10.1.z]) +* Wed Dec 10 2025 Miroslav Rezanina - 24.4-7 +- ci-downstream-Do-not-override-changes-in-disable-sshd-k.patch [RHEL-128097] +- Resolves: RHEL-128097 + ([rhel-10] cloud-init upgrade is overwriting modifications in disable-sshd-keygen-if-cloud-init-active.conf) * Fri Jul 04 2025 Miroslav Rezanina - 24.4-6 - ci-fix-Don-t-attempt-to-identify-non-x86-OpenStack-inst.patch [RHEL-100617]