diff options
| author | Scott Moser <smoser@ubuntu.com> | 2010-01-14 17:00:28 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2010-01-14 17:00:28 -0500 |
| commit | 89bff8f826040f7c9d1cc85880eaf016e72d2191 (patch) | |
| tree | c389845f381833ec236ec663d71298534ea53fc5 /upstart | |
| parent | 56563878d00a6dc0c0853e97087ac86e5e8df666 (diff) | |
| download | vyos-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')
| -rw-r--r-- | upstart/cloud-config-ssh.conf (renamed from upstart/cloud-config-ssh.conf.disabled) | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/upstart/cloud-config-ssh.conf.disabled b/upstart/cloud-config-ssh.conf index 6127cb73..a5833198 100644 --- a/upstart/cloud-config-ssh.conf.disabled +++ b/upstart/cloud-config-ssh.conf @@ -4,9 +4,7 @@ description "Download preconfigured ssh keys" -start on (cloud-config - and local-filesystems - and net-device-ifup IFACE=eth0 and starting ssh) +start on (cloud-config and local-filesystems) console output task |