|
 |
ad9e5f |
From b545a0cbabe8924d048b7172b30e7aad59ed32d5 Mon Sep 17 00:00:00 2001
|
|
|
fc6e82 |
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
|
fc6e82 |
Date: Thu, 20 May 2021 08:53:55 +0200
|
|
|
ad9e5f |
Subject: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in
|
|
|
ad9e5f |
cloud.cfg
|
|
|
fc6e82 |
|
|
|
fc6e82 |
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
|
fc6e82 |
RH-MergeRequest: 10: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
|
|
|
fc6e82 |
RH-Commit: [1/1] 6da989423b9b6e017afbac2f1af3649b0487310f
|
|
|
fc6e82 |
RH-Bugzilla: 1957532
|
|
|
fc6e82 |
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
|
|
fc6e82 |
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
|
fc6e82 |
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
fc6e82 |
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
|
|
fc6e82 |
|
|
|
fc6e82 |
Currently genkeytypes in cloud.cfg is set to None, so together with
|
|
|
fc6e82 |
ssh_deletekeys=1 cloudinit on first boot it will just delete the existing
|
|
|
fc6e82 |
keys and not generate new ones.
|
|
|
fc6e82 |
|
|
|
fc6e82 |
Just removing that property in cloud.cfg is not enough, because
|
|
|
fc6e82 |
settings.py provides another empty default value that will be used
|
|
|
fc6e82 |
instead, resulting to no key generated even when the property is not defined.
|
|
|
fc6e82 |
|
|
|
fc6e82 |
Removing genkeytypes also in settings.py will default to GENERATE_KEY_NAMES,
|
|
|
fc6e82 |
but since we want only 'rsa', 'ecdsa' and 'ed25519', add back genkeytypes in
|
|
|
fc6e82 |
cloud.cfg with the above defaults.
|
|
|
fc6e82 |
|
|
|
fc6e82 |
Also remove ssh_deletekeys in settings.py as we always need
|
|
|
fc6e82 |
to 1 (and it also defaults to 1).
|
|
|
fc6e82 |
|
|
|
fc6e82 |
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
|
fc6e82 |
---
|
|
|
fc6e82 |
cloudinit/settings.py | 2 --
|
|
|
fc6e82 |
rhel/cloud.cfg | 2 +-
|
|
|
fc6e82 |
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
|
fc6e82 |
|
|
|
fc6e82 |
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
|
|
ad9e5f |
index 3c2145e9..71672e10 100644
|
|
|
fc6e82 |
--- a/cloudinit/settings.py
|
|
|
fc6e82 |
+++ b/cloudinit/settings.py
|
|
|
ad9e5f |
@@ -52,8 +52,6 @@ CFG_BUILTIN = {
|
|
|
ad9e5f |
"def_log_file_mode": 0o600,
|
|
|
ad9e5f |
"log_cfgs": [],
|
|
|
ad9e5f |
"mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
|
|
ad9e5f |
- "ssh_deletekeys": False,
|
|
|
ad9e5f |
- "ssh_genkeytypes": [],
|
|
|
ad9e5f |
"syslog_fix_perms": [],
|
|
|
ad9e5f |
"system_info": {
|
|
|
ad9e5f |
"paths": {
|
|
|
fc6e82 |
diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
|
|
|
fc6e82 |
index 9ecba215..cbee197a 100644
|
|
|
fc6e82 |
--- a/rhel/cloud.cfg
|
|
|
fc6e82 |
+++ b/rhel/cloud.cfg
|
|
|
fc6e82 |
@@ -7,7 +7,7 @@ ssh_pwauth: 0
|
|
|
fc6e82 |
mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
|
|
|
fc6e82 |
resize_rootfs_tmp: /dev
|
|
|
fc6e82 |
ssh_deletekeys: 1
|
|
|
fc6e82 |
-ssh_genkeytypes: ~
|
|
|
fc6e82 |
+ssh_genkeytypes: ['rsa', 'ecdsa', 'ed25519']
|
|
|
fc6e82 |
syslog_fix_perms: ~
|
|
|
fc6e82 |
disable_vmware_customization: false
|
|
|
fc6e82 |
|
|
|
fc6e82 |
--
|
|
|
ad9e5f |
2.31.1
|
|
|
fc6e82 |
|