From 46b71b3a2dd8fb9cff34dbc217f5f4a69bad08cb Mon Sep 17 00:00:00 2001 From: Camilla Conte Date: Thu, 23 Nov 2023 09:02:29 +0100 Subject: [PATCH] * Thu Nov 23 2023 Camilla Conte - 23.1.1-12 - ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [RHEL-16572] - Resolves: RHEL-16572 ([cloud-init][rhel-8] Backport the patch "rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg" to fix settings.py) --- ...emove-ssh_genkeytypes-in-settings.py.patch | 60 +++++++++++++++++++ cloud-init.spec | 9 ++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch diff --git a/ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch b/ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch new file mode 100644 index 0000000..b0387f2 --- /dev/null +++ b/ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch @@ -0,0 +1,60 @@ +From 5d6674508c6478fa2ca3d8c5d39b533a0bbb317a Mon Sep 17 00:00:00 2001 +From: Emanuele Giuseppe Esposito +Date: Thu, 20 May 2021 08:53:55 +0200 +Subject: [PATCH] rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set + in cloud.cfg + +RH-Author: Ani Sinha +RH-MergeRequest: 113: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg +RH-Jira: RHEL-16572 +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Emanuele Giuseppe Esposito +RH-Commit: [1/1] f506bf58dc5458f50624342ec33bcd390aa0b719 (anisinha/rhel-cloud-init) + +RH-Author: Emanuele Giuseppe Esposito +RH-MergeRequest: 10: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg +RH-Commit: [1/1] 6da989423b9b6e017afbac2f1af3649b0487310f +RH-Bugzilla: 1957532 +RH-Acked-by: Eduardo Otubo +RH-Acked-by: Cathy Avery +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Mohamed Gamal Morsy + +Currently genkeytypes in cloud.cfg is set to None, so together with +ssh_deletekeys=1 cloudinit on first boot it will just delete the existing +keys and not generate new ones. + +Just removing that property in cloud.cfg is not enough, because +settings.py provides another empty default value that will be used +instead, resulting to no key generated even when the property is not defined. + +Removing genkeytypes also in settings.py will default to GENERATE_KEY_NAMES, +but since we want only 'rsa', 'ecdsa' and 'ed25519', add back genkeytypes in +cloud.cfg with the above defaults. + +Also remove ssh_deletekeys in settings.py as we always need +to 1 (and it also defaults to 1). + +Signed-off-by: Emanuele Giuseppe Esposito +(cherry picked from commit b545a0cbabe8924d048b7172b30e7aad59ed32d5) +(cherry picked from commit 855dec5dcc0892c0f7cedf06b025a794769a2a8d) +--- + cloudinit/settings.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/cloudinit/settings.py b/cloudinit/settings.py +index a36c518d..859ad546 100644 +--- a/cloudinit/settings.py ++++ b/cloudinit/settings.py +@@ -55,8 +55,6 @@ CFG_BUILTIN = { + "log_cfgs": [], + "syslog_fix_perms": [], + "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"], +- "ssh_deletekeys": False, +- "ssh_genkeytypes": [], + "system_info": { + "paths": { + "cloud_dir": "/var/lib/cloud", +-- +2.41.0 + diff --git a/cloud-init.spec b/cloud-init.spec index 3285fa5..b4a5671 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -6,7 +6,7 @@ Name: cloud-init Version: 23.1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base @@ -56,6 +56,8 @@ Patch29: ci-DS-VMware-modify-a-few-log-level-4284.patch Patch30: ci-NM-renderer-set-default-IPv6-addr-gen-mode-for-all-i.patch # For bz#2046491 - cloud-init enable both DHCPv4 and DHCPv6 when network type is ipv6_dhcpv6-stateful/ipv6_dhcpv6-stateless Patch31: ci-net-fix-ipv6_dhcpv6_stateful-stateless-slaac-configu.patch +# For RHEL-16572 - [cloud-init][rhel-8] Backport the patch "rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg" to fix settings.py +Patch32: ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch BuildArch: noarch @@ -277,6 +279,11 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Thu Nov 23 2023 Camilla Conte - 23.1.1-12 +- ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [RHEL-16572] +- Resolves: RHEL-16572 + ([cloud-init][rhel-8] Backport the patch "rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg" to fix settings.py) + * Mon Sep 18 2023 Camilla Conte - 23.1.1-11 - ci-net-fix-ipv6_dhcpv6_stateful-stateless-slaac-configu.patch [bz#2046491] - Resolves: bz#2046491