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

* Mon Jan 20 2025 Miroslav Rezanina <mrezanin@redhat.com> - 24.4-2

Browse Source 
- ci-downstream-Revert-feat-Use-NetworkManager-renderer-b.patch [RHEL-74334]
- Resolves: RHEL-74334
  ([rhel-9.6] Suggest to continue using sysconfig as the default network renderer in rhel-9.6)
This commit is contained in:
Miroslav Rezanina 2025-01-20 04:29:23 -05:00
parent dc82d4f216
commit e9ef618b3a
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ci-downstream-Revert-feat-Use-NetworkManager-renderer-b.patch Normal file
View File

@ -0,0 +1,42 @@
From 409e0cdcd730a0fd064b148147e8b3d5a2fe6c71 Mon Sep 17 00:00:00 2001
From: Ani Sinha <anisinha@redhat.com>
Date: Fri, 17 Jan 2025 10:50:03 +0530
Subject: [PATCH] downstream: Revert "feat: Use NetworkManager renderer by
default in RHEL family"
RH-Author: Ani Sinha <anisinha@redhat.com>
RH-MergeRequest: 120: downstream: Revert "feat: Use NetworkManager renderer by default in RHEL family"
RH-Jira: RHEL-74334
RH-Acked-by: xiachen <xiachen@redhat.com>
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
RH-Commit: [1/1] c466d30ee35576293011270591ec24773fc69251 (anisinha/cloud-init)
This reverts commit 97537494d95f733fce260beb5a2d465cccf9f6c7.
c9s has used sysconfig as its default network config renderer for historical
reasons. It should continue to do so. In RHEL-10, we can move to NM as its
default renderer. Therefore, revert the upstream change that makes NM as the
default for RHEL family.
X-downstream-only: true
Signed-off-by: Ani Sinha <anisinha@redhat.com>
---
config/cloud.cfg.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
index 82a7e0fe5..b4a6bc936 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -313,7 +313,7 @@ system_info:
activators: ['netplan', 'eni', 'network-manager', 'networkd']
{% elif is_rhel %}
network:
- renderers: ['eni', 'netplan', 'network-manager', 'sysconfig', 'networkd']
+ renderers: ['sysconfig', 'eni', 'netplan', 'network-manager', 'networkd']
{% endif %}
{% if variant == "photon" %}
# If set to true, cloud-init will not use fallback network config.
--
2.39.3

9
cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init
Version: 24.4
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Cloud instance init scripts
License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init
@ -13,6 +13,8 @@ Patch2: 0002-downstream-Setting-autoconnect-priority-setting-for-.patch
Patch3: 0004-downstream-Revert-chore-eliminate-redundant-ordering.patch
Patch4: 0005-downstream-remove-single-process-optimization.patch
Patch5: 0006-fix-don-t-deadlock-when-starting-network-service-wit.patch
# For RHEL-74334 - [rhel-9.6] Suggest to continue using sysconfig as the default network renderer in rhel-9.6
Patch6: ci-downstream-Revert-feat-Use-NetworkManager-renderer-b.patch
BuildArch: noarch
@ -227,6 +229,11 @@ fi
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
%changelog
* Mon Jan 20 2025 Miroslav Rezanina <mrezanin@redhat.com> - 24.4-2
- ci-downstream-Revert-feat-Use-NetworkManager-renderer-b.patch [RHEL-74334]
- Resolves: RHEL-74334
([rhel-9.6] Suggest to continue using sysconfig as the default network renderer in rhel-9.6)
* Mon Jan 06 2025 Miroslav Rezanina <mrezanin@redhat.com> - 24.4-1
- Rebase to 24.4 [RHEL-66251]
- Resolves: RHEL-66251