summaryrefslogtreecommitdiff
path: root/upstart/cloud-config-ssh.conf.disabled
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-01-14 17:00:28 -0500
committerScott Moser <smoser@ubuntu.com>2010-01-14 17:00:28 -0500
commit89bff8f826040f7c9d1cc85880eaf016e72d2191 (patch)
treec389845f381833ec236ec663d71298534ea53fc5 /upstart/cloud-config-ssh.conf.disabled
parent56563878d00a6dc0c0853e97087ac86e5e8df666 (diff)
downloadvyos-cloud-init-89bff8f826040f7c9d1cc85880eaf016e72d2191.tar.gz
vyos-cloud-init-89bff8f826040f7c9d1cc85880eaf016e72d2191.zip
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
Diffstat (limited to 'upstart/cloud-config-ssh.conf.disabled')
-rw-r--r--upstart/cloud-config-ssh.conf.disabled13
1 files changed, 0 insertions, 13 deletions
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