From 49d3df468a94fef41a036dfa5d886449d180e006 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@nelson>
Date: Thu, 7 Jan 2010 16:07:01 -0500
Subject: functional state now in kvm tests

supports user data as mime-multipart and handling types of
  text/x-shellscript  - execute at rc.local
  text/cloud-config   - feed to cloud config
  text/upstart-job    - add to /etc/init as upstart job
  text/x-include-url  - include urls as if they were in-line
---
 upstart/cat-cloud-config.conf      | 2 +-
 upstart/cloud-run-user-script.conf | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'upstart')

diff --git a/upstart/cat-cloud-config.conf b/upstart/cat-cloud-config.conf
index 3f053896..9cc3b2ce 100644
--- a/upstart/cat-cloud-config.conf
+++ b/upstart/cat-cloud-config.conf
@@ -4,4 +4,4 @@ start on cloud-config
 console output
 task
 
-exec cloud-init-run-module once_per_ami catconfig execute cat $CLOUD_CFG
+exec cloud-init-run-module once-per-instance catconfig execute cat $CLOUD_CFG
diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf
index 49edbea4..31484d01 100644
--- a/upstart/cloud-run-user-script.conf
+++ b/upstart/cloud-run-user-script.conf
@@ -7,5 +7,8 @@ start on stopped rc RUNLEVEL=[2345]
 console output
 task
 
-exec cloud-init-run-module once_per_ami user-scripts execute \
-    run-parts "/var/lib/cloud/scripts"
+script
+sdir=/var/lib/cloud/data/scripts
+[ -d "$sdir" ] || exit 0
+exec cloud-init-run-module once_per_ami user-scripts execute run-parts "$sdir"
+end script
-- 
cgit v1.2.3