diff options
| -rw-r--r-- | cloudinit/CloudConfig/cc_ssh.py | 13 | ||||
| -rwxr-xr-x | setup.py | 3 | ||||
| -rwxr-xr-x | tools/write-ssh-key-fingerprints | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/cloudinit/CloudConfig/cc_ssh.py b/cloudinit/CloudConfig/cc_ssh.py index 07527906..682875a2 100644 --- a/cloudinit/CloudConfig/cc_ssh.py +++ b/cloudinit/CloudConfig/cc_ssh.py @@ -60,18 +60,7 @@ def handle(name,cfg,cloud,log,args): send_ssh_keys_to_console() def send_ssh_keys_to_console(): - send_keys_sh = """ - { - echo - echo "#############################################################" - echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" - ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub - ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub - echo "-----END SSH HOST KEY FINGERPRINTS-----" - echo "#############################################################" - } | logger -p user.info -s -t "ec2" - """ - subprocess.call(('sh', '-c', send_keys_sh)) + subprocess.call(('/usr/lib/cloud-init/write-ssh-key-fingerprints',)) def apply_credentials(keys, user, disable_root): keys = set(keys) @@ -41,7 +41,8 @@ setup(name='cloud-init', ('/etc/cloud/templates', glob('templates/*')), ('/etc/init', glob('upstart/*.conf')), ('/usr/share/cloud-init', []), - ('/usr/lib/cloud-init', ['tools/uncloud-init']), + ('/usr/lib/cloud-init', + ['tools/uncloud-init', 'tools/write-ssh-key-fingerprints']), ('/usr/share/doc/cloud-init', filter(is_f,glob('doc/*'))), ('/usr/share/doc/cloud-init/examples', filter(is_f,glob('doc/examples/*'))), ('/usr/share/doc/cloud-init/examples/seed', filter(is_f,glob('doc/examples/seed/*'))), diff --git a/tools/write-ssh-key-fingerprints b/tools/write-ssh-key-fingerprints new file mode 100755 index 00000000..9a081faa --- /dev/null +++ b/tools/write-ssh-key-fingerprints @@ -0,0 +1,10 @@ +#!/bin/sh +{ +echo +echo "#############################################################" +echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" +ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub +ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub +echo "-----END SSH HOST KEY FINGERPRINTS-----" +echo "#############################################################" +} | logger -p user.info -s -t "ec2" |