change upstart jobs to use single 'cloud-init' binary

This just updates upstart jobs to the new single binary approach.
janitha · Jun 28, 2012 · 0b79a18 · 0b79a18
1 parent c8c8c09
commit 0b79a18
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/upstart/cloud-config.conf b/upstart/cloud-config.conf
@@ -5,4 +5,4 @@ start on (filesystem and started rsyslog)
 console output
 task
 
-exec cloud-init-cfg all config
+exec cloud-init modules --mode=config
diff --git a/upstart/cloud-final.conf b/upstart/cloud-final.conf
@@ -7,4 +7,4 @@ start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config)
 console output
 task
 
-exec cloud-init-cfg all final
+exec cloud-init modules --mode=final
diff --git a/upstart/cloud-init-local.conf b/upstart/cloud-init-local.conf
@@ -6,4 +6,4 @@ task
 
 console output
 
-exec /usr/bin/cloud-init start-local
+exec /usr/bin/cloud-init init --local  
diff --git a/upstart/cloud-init.conf b/upstart/cloud-init.conf
@@ -6,4 +6,4 @@ task
 
 console output
 
-exec /usr/bin/cloud-init start
+exec /usr/bin/cloud-init init
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ task

		console output

		exec /usr/bin/cloud-init start-local
		exec /usr/bin/cloud-init init --local