From 54346d35221fd405423dd33a2b06202f10e2aa22 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 12 Aug 2010 01:56:12 -0400 Subject: 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. --- upstart/cloud-init-local.conf | 9 +++++++++ upstart/cloud-init.conf | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 upstart/cloud-init-local.conf (limited to 'upstart') 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 -- cgit v1.2.3