diff options
| author | Scott Moser <smoser@nelson> | 2010-01-11 23:29:18 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@nelson> | 2010-01-11 23:29:18 -0500 |
| commit | 969cbd1b5daa98a6e4d0d87750bde348fcf267e6 (patch) | |
| tree | 62e3678a5c6dfea631726acb112fc9c924a4095b /upstart | |
| parent | d29998f111bf02e66d600b0aefbb12fc2517d5d6 (diff) | |
| download | vyos-cloud-init-969cbd1b5daa98a6e4d0d87750bde348fcf267e6.tar.gz vyos-cloud-init-969cbd1b5daa98a6e4d0d87750bde348fcf267e6.zip | |
refactor the config class and jobs to run through cloud-init-cfg
At this point, the following should be functional:
cloud-init-cfg apt-update-upgrade
Diffstat (limited to 'upstart')
| -rw-r--r-- | upstart/cloud-apt-update-upgrade.conf (renamed from upstart/ec2-update-software.conf) | 4 | ||||
| -rw-r--r-- | upstart/cloud-config-ssh.conf (renamed from upstart/ec2-preconf-ssh-keys.conf) | 6 | ||||
| -rw-r--r-- | upstart/cloud-ebs-mounts.conf (renamed from upstart/ec2-ebs-mounts.conf) | 2 | ||||
| -rw-r--r-- | upstart/cloud-raid.conf (renamed from upstart/ec2-raid.conf) | 2 | ||||
| -rw-r--r-- | upstart/cloud-run-user-script.conf | 2 | ||||
| -rw-r--r-- | upstart/cloud-runurl.conf (renamed from upstart/ec2-runurl.conf) | 2 | ||||
| -rw-r--r-- | upstart/ec2-apt-update.conf | 13 |
7 files changed, 9 insertions, 22 deletions
diff --git a/upstart/ec2-update-software.conf b/upstart/cloud-apt-update-upgrade.conf index ee3131d1..a5060f69 100644 --- a/upstart/ec2-update-software.conf +++ b/upstart/cloud-apt-update-upgrade.conf @@ -6,7 +6,7 @@ description "Update software at boot" start on (cloud-config and local-filesystem - and net-device-iup IFACE=eth0) + and net-device-up IFACE=eth0) console output -exec /usr/sbin/ec2-update-software +exec cloud-init-cfg apt-update-upgrade diff --git a/upstart/ec2-preconf-ssh-keys.conf b/upstart/cloud-config-ssh.conf index 383b5bbc..65d29941 100644 --- a/upstart/ec2-preconf-ssh-keys.conf +++ b/upstart/cloud-config-ssh.conf @@ -6,8 +6,8 @@ description "Download preconfigured ssh keys" start on (cloud-config and local-filesystem - and net-device-ifup IFACE=eth0) -console out + and net-device-ifup IFACE=eth0 and starting ssh) +console output task -exec /usr/sbin/ec2-preconf-ssh-keys +exec cloud-init-cfg config-ssh diff --git a/upstart/ec2-ebs-mounts.conf b/upstart/cloud-ebs-mounts.conf index a1457f6a..03ddfa40 100644 --- a/upstart/ec2-ebs-mounts.conf +++ b/upstart/cloud-ebs-mounts.conf @@ -9,4 +9,4 @@ start on cloud-config console output task -exec /usr/sbin/ec2-ebs-mount +exec cloud-init-cfg ec2-ebs-mounts diff --git a/upstart/ec2-raid.conf b/upstart/cloud-raid.conf index e4364373..d4644c89 100644 --- a/upstart/ec2-raid.conf +++ b/upstart/cloud-raid.conf @@ -9,4 +9,4 @@ start on (cloud-config console output task -exec /usr/sbin/ec2-setup-raid +exec cloud-init-cfg setup-raid diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf index cf76fe32..272bc409 100644 --- a/upstart/cloud-run-user-script.conf +++ b/upstart/cloud-run-user-script.conf @@ -3,7 +3,7 @@ description "execute cloud user scripts" -start on (stopped rc RUNLEVEL=[2345] and cloud-config) +start on (stopped ec2init and stopped rc RUNLEVEL=[2345]) console output task diff --git a/upstart/ec2-runurl.conf b/upstart/cloud-runurl.conf index 28249f8d..f2140c32 100644 --- a/upstart/ec2-runurl.conf +++ b/upstart/cloud-runurl.conf @@ -10,4 +10,4 @@ start on (cloud-config console output task -exec /usr/sbin/ec2-runurl +exec cloud-init-cfg runurl diff --git a/upstart/ec2-apt-update.conf b/upstart/ec2-apt-update.conf deleted file mode 100644 index b280801b..00000000 --- a/upstart/ec2-apt-update.conf +++ /dev/null @@ -1,13 +0,0 @@ -# ec2-apt-update - Update archive at boot time -# -# Update archive at boot - -description "Update archive at boot" - -start on (cloud-config - and local-filesystems - and net-device-up IFACE=eth0) -console output -task -# exec /usr/sbin/cloud-init-run --once ec2-apt-update ec2-apt-update -exec /usr/sbin/ec2-apt-update |