summaryrefslogtreecommitdiff
path: root/upstart
diff options
context:
space:
mode:
Diffstat (limited to 'upstart')
-rw-r--r--upstart/cloud-init-local.conf9
-rw-r--r--upstart/cloud-init.conf3
2 files changed, 11 insertions, 1 deletions
diff --git a/upstart/cloud-init-local.conf b/upstart/cloud-init-local.conf
new file mode 100644
index 00000000..b6eb21b4
--- /dev/null
+++ b/upstart/cloud-init-local.conf
@@ -0,0 +1,9 @@
+# cloud-init - the initial cloud-init job
+# crawls metadata service, emits cloud-config
+start on mounted MOUNTPOINT=/
+
+task
+
+console output
+
+exec /usr/bin/cloud-init start-local
diff --git a/upstart/cloud-init.conf b/upstart/cloud-init.conf
index 2a066105..cb2b437b 100644
--- a/upstart/cloud-init.conf
+++ b/upstart/cloud-init.conf
@@ -1,6 +1,7 @@
# cloud-init - the initial cloud-init job
# crawls metadata service, emits cloud-config
-start on (mounted MOUNTPOINT=/ and net-device-up IFACE=eth0)
+start on (mounted MOUNTPOINT=/ and net-device-up IFACE=eth0 and \
+ stopped cloud-init-local )
task