diff options
| author | Scott Moser <smoser@nelson> | 2010-01-07 16:07:01 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@nelson> | 2010-01-07 16:07:01 -0500 |
| commit | 49d3df468a94fef41a036dfa5d886449d180e006 (patch) | |
| tree | 45dccadb6bef5621eac2d692e893e6ff8aeccae8 /upstart | |
| parent | 44e69ea67e75241dce3230f755c13ab602a5ea9b (diff) | |
| download | vyos-cloud-init-49d3df468a94fef41a036dfa5d886449d180e006.tar.gz vyos-cloud-init-49d3df468a94fef41a036dfa5d886449d180e006.zip | |
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
Diffstat (limited to 'upstart')
| -rw-r--r-- | upstart/cat-cloud-config.conf | 2 | ||||
| -rw-r--r-- | upstart/cloud-run-user-script.conf | 7 |
2 files changed, 6 insertions, 3 deletions
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 |