← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~smoser/cloud-init:fix/1781094-ssh-deletekeys into cloud-init:master

 

Scott Moser has proposed merging ~smoser/cloud-init:fix/1781094-ssh-deletekeys into cloud-init:master.

Commit message:
redhat: remove ssh keys on new instance.

This changes redhat's default behavior to remove the ssh keys on
new instance (ssh_deletekeys will now be at its default true value).

On redhat systems, cloud-init 'Wants sshd-keygen.service', which is
why 'ssh_genkeytypes' is disabled.  I've changed this to be 'null'
rather than '~', as that seems just more clear.

LP: #1781094
rhbz: https://bugzilla.redhat.com/show_bug.cgi?id=1598832

Requested reviews:
  cloud-init commiters (cloud-init-dev)
Related bugs:
  Bug #1781094 in cloud-init: "cloud.cfg.tmpl should not include "ssh_deletekeys: 0""
  https://bugs.launchpad.net/cloud-init/+bug/1781094

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/349359

see commit message
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:fix/1781094-ssh-deletekeys into cloud-init:master.
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
index 5619de3..1fef133 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -24,8 +24,6 @@ disable_root: true
 {% if variant in ["centos", "fedora", "rhel"] %}
 mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
 resize_rootfs_tmp: /dev
-ssh_deletekeys:   0
-ssh_genkeytypes:  ~
 ssh_pwauth:   0
 
 {% endif %}

Follow ups