diff options
| -rw-r--r-- | upstart/cloud-apt-update-upgrade.conf | 9 | ||||
| -rw-r--r-- | upstart/cloud-config-misc.conf | 6 | ||||
| -rw-r--r-- | upstart/cloud-config-mounts.conf | 4 | ||||
| -rw-r--r-- | upstart/cloud-config-puppet.conf | 3 | ||||
| -rw-r--r-- | upstart/cloud-config-ssh.conf | 7 | ||||
| -rw-r--r-- | upstart/cloud-disable-ec2-metadata.conf | 9 | ||||
| -rw-r--r-- | upstart/cloud-init.conf | 7 | ||||
| -rw-r--r-- | upstart/cloud-run-user-script.conf | 8 |
8 files changed, 20 insertions, 33 deletions
diff --git a/upstart/cloud-apt-update-upgrade.conf b/upstart/cloud-apt-update-upgrade.conf index bf21cd8b..ef907360 100644 --- a/upstart/cloud-apt-update-upgrade.conf +++ b/upstart/cloud-apt-update-upgrade.conf @@ -1,12 +1,7 @@ -# ec2-software-update - Update software at boot -# -# Update software at boot - +# cloud-apt-update-upgrade - Update software at boot description "Update software at boot" -start on (cloud-config - and local-filesystems - and net-device-up IFACE=eth0) +start on filesystem console output exec cloud-init-cfg apt-update-upgrade diff --git a/upstart/cloud-config-misc.conf b/upstart/cloud-config-misc.conf index f98ff3ad..9133794e 100644 --- a/upstart/cloud-config-misc.conf +++ b/upstart/cloud-config-misc.conf @@ -1,8 +1,8 @@ -# Miscellaneous cloud-config items -# includes enabling 'updates check' +# cloud-config-misc - Miscellaneous cloud-config items +# includes enabling 'updates check' description "Run miscellaneous cloud-config items" -start on cloud-config +start on filesystem console output task diff --git a/upstart/cloud-config-mounts.conf b/upstart/cloud-config-mounts.conf index 78d70270..81a0befa 100644 --- a/upstart/cloud-config-mounts.conf +++ b/upstart/cloud-config-mounts.conf @@ -1,6 +1,8 @@ +# cloud-config-mounts - setup mount points from cloud-config +# includes enabling swap description "Setup mount points in fstab per config" -start on (cloud-config and local-filesystems) +start on cloud-config console output task diff --git a/upstart/cloud-config-puppet.conf b/upstart/cloud-config-puppet.conf index effa0b84..a42b0dc6 100644 --- a/upstart/cloud-config-puppet.conf +++ b/upstart/cloud-config-puppet.conf @@ -1,5 +1,4 @@ -# Setup puppetd - +# cloud-config-puppet - Setup puppetd description "Setup puppetd" # Make sure puppet is started after repositories have been setup. diff --git a/upstart/cloud-config-ssh.conf b/upstart/cloud-config-ssh.conf index a5833198..98b3d6cc 100644 --- a/upstart/cloud-config-ssh.conf +++ b/upstart/cloud-config-ssh.conf @@ -1,10 +1,7 @@ -# ec2-preconf-ssh-keys -# -# Download preconfigured ssh-keys for EC2. - +# cloud-config-ssh - obtain ssh keys from metadata service description "Download preconfigured ssh keys" -start on (cloud-config and local-filesystems) +start on filesystem console output task diff --git a/upstart/cloud-disable-ec2-metadata.conf b/upstart/cloud-disable-ec2-metadata.conf index 9c8df3a8..7cb044bc 100644 --- a/upstart/cloud-disable-ec2-metadata.conf +++ b/upstart/cloud-disable-ec2-metadata.conf @@ -1,10 +1,7 @@ -# ec2-preconf-ssh-keys -# -# Download preconfigured ssh-keys for EC2. +# cloud-disable-ec2-metadata - Disable the ec2 metadata service +description "Disable the ec2 metadata service" -description "Download preconfigured ssh keys" - -start on (cloud-config and local-filesystems) +start on filesystem console output task diff --git a/upstart/cloud-init.conf b/upstart/cloud-init.conf index 56a3545a..2a066105 100644 --- a/upstart/cloud-init.conf +++ b/upstart/cloud-init.conf @@ -1,7 +1,6 @@ -#start on (mounted MOUNTPOINT=/ and net-device-up IFACE=eth0) -# the above start-on never occurs, blocking boot. [bug 504883] -# instead, start much later in the boot process. sigh.. -start on (local-filesystems and net-device-up IFACE=eth0) +# cloud-init - the initial cloud-init job +# crawls metadata service, emits cloud-config +start on (mounted MOUNTPOINT=/ and net-device-up IFACE=eth0) task diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf index c089a0cc..886781b3 100644 --- a/upstart/cloud-run-user-script.conf +++ b/upstart/cloud-run-user-script.conf @@ -1,10 +1,8 @@ -# this runs user scripts found in user-data, that are -# stored in /var/lib/cloud/scripts by the initial cloudinit upstart job - +# cloud-run-user-script - runs user scripts found in user-data, that are +# stored in /var/lib/cloud/scripts by the initial cloudinit upstart job description "execute cloud user scripts" -start on (stopped cloud-init and stopped rc RUNLEVEL=[2345] and \ - stopped cloud-config-misc ) +start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config-misc) console output task |