summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-06-28 16:46:11 -0400
committerScott Moser <smoser@ubuntu.com>2012-06-28 16:46:11 -0400
commit0b79a18679e03b300a8a607f28f8fd1c9acbf39e (patch)
tree15481a69a0b8a073f72293405842d6548bf7e111
parentc8c8c09890a21540bf3c9c0212e6e2c01aecc4db (diff)
downloadvyos-cloud-init-0b79a18679e03b300a8a607f28f8fd1c9acbf39e.tar.gz
vyos-cloud-init-0b79a18679e03b300a8a607f28f8fd1c9acbf39e.zip
change upstart jobs to use single 'cloud-init' binary
This just updates upstart jobs to the new single binary approach.
-rw-r--r--upstart/cloud-config.conf2
-rw-r--r--upstart/cloud-final.conf2
-rw-r--r--upstart/cloud-init-local.conf2
-rw-r--r--upstart/cloud-init.conf2
4 files changed, 4 insertions, 4 deletions
diff --git a/upstart/cloud-config.conf b/upstart/cloud-config.conf
index 5edc58b9..3ac113f3 100644
--- 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
index a04105a1..72ae5052 100644
--- 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
index b6eb21b4..061fe406 100644
--- 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
index b9be5981..41ddd284 100644
--- 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