summaryrefslogtreecommitdiff
path: root/cloud-init.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-01-24 14:03:01 -0500
committerScott Moser <smoser@ubuntu.com>2011-01-24 14:03:01 -0500
commitb9b0a79b5a1b142b9e1176d64f294cf9c9f84157 (patch)
tree35e2bf3d87a451fdb1c87b8cbfa1216e46813126 /cloud-init.py
parent9ebce731fe86e534ecb2bedca6dea27ce5179f44 (diff)
parent0b7f896201348ab791e89bb9f736d62a2941c14d (diff)
downloadvyos-cloud-init-b9b0a79b5a1b142b9e1176d64f294cf9c9f84157.tar.gz
vyos-cloud-init-b9b0a79b5a1b142b9e1176d64f294cf9c9f84157.zip
merge in fixes to get to functioning point
Diffstat (limited to 'cloud-init.py')
-rwxr-xr-xcloud-init.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloud-init.py b/cloud-init.py
index 7c261c26..347982d7 100755
--- a/cloud-init.py
+++ b/cloud-init.py
@@ -60,7 +60,7 @@ def main():
try:
cloudinit.initfs()
except Exception, e:
- warn("failed to initfs, likely bad things to come: %s" % str(e))
+ warn("failed to initfs, likely bad things to come: %s\n" % str(e))
cloudinit.logging_set_from_cfg_file()
@@ -104,10 +104,10 @@ def main():
cfg_path = cloudinit.get_ipath_cur("cloud_config")
cc = CC.CloudConfig(cfg_path, cloud)
- modules_list = CC.read_cc_modules(cc.cfg,"cloud_init_modules")
+ module_list = CC.read_cc_modules(cc.cfg,"cloud_init_modules")
failures = []
- if len(modules_list):
+ if len(module_list):
failures = CC.run_cc_modules(cc,module_list,log)
else:
msg = "no cloud_init_modules to run"