summaryrefslogtreecommitdiff
path: root/upstart
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-08-12 01:56:12 -0400
committerScott Moser <smoser@ubuntu.com>2010-08-12 01:56:12 -0400
commit54346d35221fd405423dd33a2b06202f10e2aa22 (patch)
tree71b636d2967abbb53cdb4d3c70061524e2add7ff /upstart
parenta43357425d32b53aa58e226613e7fa2dd0714102 (diff)
downloadvyos-cloud-init-54346d35221fd405423dd33a2b06202f10e2aa22.tar.gz
vyos-cloud-init-54346d35221fd405423dd33a2b06202f10e2aa22.zip
initial dump of "sans-cloud" code (DataSourceNoCloud)
The new classes 'DataSourceNoCloud' and 'DataSourceNoCloudNet' implement a way to get data from the filesystem, or (very minimal) data from the kernel command line. This allows the user to seed data to these sources. There are now 2 "cloud-init" jobs, cloud-init-local that runs on mounted MOUNTPOINT=/ and 'cloud-init' that runs on start on (mounted MOUNTPOINT=/ and net-device-up IFACE=eth0 and stopped cloud-init-local ) The idea is that cloud-init-local can actually function without network. The last thing in this commit is "uncloud-init". This tool can be invoked as 'init=/usr/lib/cloud-init/uncloud-init' It will "uncloudify" things in the image, generally making it easier to use for a simpler environment, and then it will exec /sbin/init.
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