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