12 files changed, 8 insertions, 97 deletions
diff --git a/upstart/cloud-apt-update-upgrade.conf b/upstart/cloud-apt-update-upgrade.conf
deleted file mode 100644
index ef907360..00000000
--- a/upstart/cloud-apt-update-upgrade.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# cloud-apt-update-upgrade - Update software at boot
-description "Update software at boot"
-
-start on filesystem
-console output
-
-exec cloud-init-cfg apt-update-upgrade
diff --git a/upstart/cloud-config-cat.conf.debug b/upstart/cloud-config-cat.conf.debug
deleted file mode 100644
index 9cc3b2ce..00000000
--- a/upstart/cloud-config-cat.conf.debug
+++ /dev/null
@@ -1,7 +0,0 @@
-description "Cat the Config"
-
-start on cloud-config
-console output
-task
-
-exec cloud-init-run-module once-per-instance catconfig execute cat $CLOUD_CFG
diff --git a/upstart/cloud-config-misc.conf b/upstart/cloud-config-misc.conf
deleted file mode 100644
index 9133794e..00000000
--- a/upstart/cloud-config-misc.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloud-config-misc - Miscellaneous cloud-config items
-#   includes enabling 'updates check'
-description "Run miscellaneous cloud-config items"
-
-start on filesystem
-console output
-task
-
-exec cloud-init-cfg config-misc
diff --git a/upstart/cloud-config-mounts.conf b/upstart/cloud-config-mounts.conf
deleted file mode 100644
index cbe15256..00000000
--- a/upstart/cloud-config-mounts.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloud-config-mounts - setup mount points from cloud-config
-#   includes enabling swap
-description "Setup mount points in fstab per config"
-
-start on filesystem
-console output
-task
-
-exec cloud-init-cfg config-mounts
diff --git a/upstart/cloud-config-puppet.conf b/upstart/cloud-config-puppet.conf
deleted file mode 100644
index a42b0dc6..00000000
--- a/upstart/cloud-config-puppet.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# cloud-config-puppet - Setup puppetd
-description "Setup puppetd"
-
-# Make sure puppet is started after repositories have been setup.
-# This can be useful if the puppet package should be pulled from
-# a different repository.
-start on stopped cloud-apt-update-upgrade
-console output
-task
-
-exec cloud-init-cfg config-puppet
diff --git a/upstart/cloud-config-ssh.conf b/upstart/cloud-config-ssh.conf
deleted file mode 100644
index 98b3d6cc..00000000
--- a/upstart/cloud-config-ssh.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# cloud-config-ssh - obtain ssh keys from metadata service
-description "Download preconfigured ssh keys"
-
-start on filesystem
-console output
-task
-
-exec cloud-init-cfg config-ssh
diff --git a/upstart/cloud-config.conf b/upstart/cloud-config.conf
new file mode 100644
index 00000000..12caaaa7
--- /dev/null
+++ b/upstart/cloud-config.conf
@@ -0,0 +1,7 @@
+# cloud-config - Handle applying the settings specified in cloud-config
+description "Handle applying cloud-config"
+
+start on filesystem and started syslogd
+console output
+
+exec cloud-init-cfg all
diff --git a/upstart/cloud-disable-ec2-metadata.conf b/upstart/cloud-disable-ec2-metadata.conf
deleted file mode 100644
index 7cb044bc..00000000
--- a/upstart/cloud-disable-ec2-metadata.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# cloud-disable-ec2-metadata - Disable the ec2 metadata service
-description "Disable the ec2 metadata service"
-
-start on filesystem
-console output
-task
-
-exec cloud-init-cfg disable-ec2-metadata
diff --git a/upstart/cloud-ebs-mounts.conf.disabled b/upstart/cloud-ebs-mounts.conf.disabled
deleted file mode 100644
index 03ddfa40..00000000
--- a/upstart/cloud-ebs-mounts.conf.disabled
+++ /dev/null
@@ -1,12 +0,0 @@
-# ec2-ebs-mounts
-#
-# Mount EC2 EBS mount points
-
-description	"Populate EBS mountpoints"
-
-start on cloud-config
-
-console output
-task
-
-exec cloud-init-cfg ec2-ebs-mounts
diff --git a/upstart/cloud-raid.conf.disabled b/upstart/cloud-raid.conf.disabled
deleted file mode 100644
index d18dd551..00000000
--- a/upstart/cloud-raid.conf.disabled
+++ /dev/null
@@ -1,12 +0,0 @@
-# ec2-raid - Setup ephemeral storage RAID and mount points
-#
-# Setup ephemeral storage RAID and mount points
-
-description "Setup RAID storage and moint points"
-
-start on (cloud-config
-	and local-filesystems)
-console output
-task
-
-exec cloud-init-cfg setup-raid
diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf
index 886781b3..e50006d4 100644
--- a/upstart/cloud-run-user-script.conf
+++ b/upstart/cloud-run-user-script.conf
@@ -2,7 +2,7 @@
 #   stored in /var/lib/cloud/scripts by the initial cloudinit upstart job
 description "execute cloud user scripts"
 
-start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config-misc)
+start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config)
 console output
 task
 
diff --git a/upstart/cloud-runurl.conf.disabled b/upstart/cloud-runurl.conf.disabled
deleted file mode 100644
index 3e2c46e0..00000000
--- a/upstart/cloud-runurl.conf.disabled
+++ /dev/null
@@ -1,13 +0,0 @@
-# ec2-runurl - Run runurl at boot
-#
-# Runurl at boot
-
-description "Run runurl"
-
-start on (cloud-config
-	and local-filesystems
-	and net-device-ifup IFACE=eth0)
-console output
-task
-
-exec cloud-init-cfg runurl