From 89bff8f826040f7c9d1cc85880eaf016e72d2191 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 14 Jan 2010 17:00:28 -0500 Subject: functional cloud-config-ssh.conf now This fixes LP: #506599 , LP: #507070 . Also, here, we move config parsing out of the EC2Init class. Instead the parsing of /etc/ec2-init/ec2-init.cfg is now done in the CloudConfig class, and prepended to the cloud-config that comes in from user data. This means that values in user data will over-ride the settings in /etc/ec2-init. Still TODO is support reading the public and private key files from the cloud-config --- upstart/cloud-config-ssh.conf | 11 +++++++++++ upstart/cloud-config-ssh.conf.disabled | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 upstart/cloud-config-ssh.conf delete mode 100644 upstart/cloud-config-ssh.conf.disabled (limited to 'upstart') diff --git a/upstart/cloud-config-ssh.conf b/upstart/cloud-config-ssh.conf new file mode 100644 index 00000000..a5833198 --- /dev/null +++ b/upstart/cloud-config-ssh.conf @@ -0,0 +1,11 @@ +# ec2-preconf-ssh-keys +# +# Download preconfigured ssh-keys for EC2. + +description "Download preconfigured ssh keys" + +start on (cloud-config and local-filesystems) +console output +task + +exec cloud-init-cfg config-ssh diff --git a/upstart/cloud-config-ssh.conf.disabled b/upstart/cloud-config-ssh.conf.disabled deleted file mode 100644 index 6127cb73..00000000 --- a/upstart/cloud-config-ssh.conf.disabled +++ /dev/null @@ -1,13 +0,0 @@ -# ec2-preconf-ssh-keys -# -# Download preconfigured ssh-keys for EC2. - -description "Download preconfigured ssh keys" - -start on (cloud-config - and local-filesystems - and net-device-ifup IFACE=eth0 and starting ssh) -console output -task - -exec cloud-init-cfg config-ssh -- cgit v1.2.3