summaryrefslogtreecommitdiff
path: root/cloud-init-run-module.py
diff options
context:
space:
mode:
authorScott Moser <smoser@nelson>2010-01-06 14:05:25 -0500
committerScott Moser <smoser@nelson>2010-01-06 14:05:25 -0500
commit6f58655f2893a2a8e2edc85130d98294d5cf4ad1 (patch)
tree190c8fecebf3dfba86091edcd1c6f5feab101f38 /cloud-init-run-module.py
parentca3cafbb65655bf0de40e8a44b608932694a5594 (diff)
downloadvyos-cloud-init-6f58655f2893a2a8e2edc85130d98294d5cf4ad1.tar.gz
vyos-cloud-init-6f58655f2893a2a8e2edc85130d98294d5cf4ad1.zip
put upstart files in upstart/, minor other changes
adding cat-cloud-config.conf, a debug file that just cats the config
Diffstat (limited to 'cloud-init-run-module.py')
-rwxr-xr-xcloud-init-run-module.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloud-init-run-module.py b/cloud-init-run-module.py
index 5a35de5d..0e32c63b 100755
--- a/cloud-init-run-module.py
+++ b/cloud-init-run-module.py
@@ -4,7 +4,7 @@ import sys
import ec2init
def Usage(out = sys.stdout):
- out.write("Usage: cloud-init-run-module freq sem-name mod-name [args]")
+ out.write("Usage: cloud-init-run-module freq sem-name mod-name [args]\n")
def main():
# expect to be called with
@@ -30,7 +30,7 @@ def main():
import os
cfg_path = None
- cfg_env_name = "CLOUD_CFG"
+ cfg_env_name = ec2init.cfg_env_name
if os.environ.has_key(cfg_env_name):
cfg_path = os.environ[cfg_env_name]