Re: AWS EC2: Jessie 8.1 AMIs

[Santiago Vila <sanvila@unex.es>]

On Mon, Nov 23, 2015 at 09:29:03PM +0900, Charles Plessy wrote:
> Le Mon, Nov 23, 2015 at 10:18:32AM +0100, Santiago Vila a écrit :
> > 
> > I will not mind if this is not fixed in time for 8.3, but I would
> > definitely expect this to be fixed in 8.x for some value of x.
> 
> Hi again,
> 
> this would require to backport the following change set, which does not apply
> on 0.7.6~bzr976 cleanly.
> 
> <http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/1125>

Based on the changeset, and trying to reduce the size of the patch to
the minimum, I would consider the attached patch for a
stable-proposed-updates release.

Note: The patch is untested. If someone can confirm that the patch
works, I'll appreciate.

Thanks.

diff --git a/cloudinit/config/cc_ssh.py b/cloudinit/config/cc_ssh.py
index 64a5e3c..7c98da1 100644
--- a/cloudinit/config/cc_ssh.py
+++ b/cloudinit/config/cc_ssh.py
@@ -40,17 +40,20 @@ KEY_2_FILE = {
     "dsa_public": ("/etc/ssh/ssh_host_dsa_key.pub", 0644),
     "ecdsa_private": ("/etc/ssh/ssh_host_ecdsa_key", 0600),
     "ecdsa_public": ("/etc/ssh/ssh_host_ecdsa_key.pub", 0644),
+    "ed25519_private": ("/etc/ssh/ssh_host_ed25519_key", 0600),
+    "ed25519_public": ("/etc/ssh/ssh_host_ed25519_key.pub", 0644),
 }
 
 PRIV_2_PUB = {
     'rsa_private': 'rsa_public',
     'dsa_private': 'dsa_public',
     'ecdsa_private': 'ecdsa_public',
+    'ed25519_private': 'ed25519_public',
 }
 
 KEY_GEN_TPL = 'o=$(ssh-keygen -yf "%s") && echo "$o" root@localhost > "%s"'
 
-GENERATE_KEY_NAMES = ['rsa', 'dsa', 'ecdsa']
+GENERATE_KEY_NAMES = ['rsa', 'dsa', 'ecdsa', 'ed25519']
 
 KEY_FILE_TPL = '/etc/ssh/ssh_host_%s_key'