From f1ff91de6193404f544708fa94d7f8508228a98d Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 24 Jan 2011 18:39:47 +0000 Subject: cloud-init.py: add trailing carriage return to message --- cloud-init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud-init.py b/cloud-init.py index 7c261c26..62ac9965 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() -- cgit v1.2.3 From 17ce079fa5a1f3dc2987ef32ff5600c13191ef16 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 24 Jan 2011 18:42:58 +0000 Subject: cloudinit/__init__.py: fixes to initfs --- cloudinit/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index 12bd0fe1..f9b20bb0 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -88,6 +88,7 @@ def logging_set_from_cfg(cfg, logfile=None): if not len(log_cfgs): sys.stderr.write("Warning, no logging configured\n") + return for logcfg in log_cfgs: try: @@ -495,15 +496,17 @@ def initfs(): util.ensure_dirs(dlist) cfg = util.get_base_cfg(system_config,cfg_builtin,parsed_cfgs) + log_file = None if 'def_log_file' in cfg: - fp = open(def_log_file,"ab") + log_file = cfg['def_log_file'] + fp = open(log_file,"ab") fp.close() - if 'syslog_fix_perms' in cfg: + if log_file and 'syslog' in cfg: perms = cfg['syslog'] (u,g) = perms.split(':',1) if u == "-1" or u == "None": u = None if g == "-1" or g == "None": g = None - util.chownbyname(def_log_file, u, g) + util.chownbyname(log_file, u, g) def purge_cache(): try: -- cgit v1.2.3 From 0740b0d5278a6629f4fab68e2c3344bedaa78169 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 24 Jan 2011 18:44:09 +0000 Subject: cloud-init.py: fix bad variable name --- cloud-init.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud-init.py b/cloud-init.py index 62ac9965..347982d7 100755 --- a/cloud-init.py +++ b/cloud-init.py @@ -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" -- cgit v1.2.3 From c57c64bae85657efddf12eea6f69f36ae3951811 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 24 Jan 2011 18:45:31 +0000 Subject: cc_update_hostname: fix bad variable name --- cloudinit/CloudConfig/cc_update_hostname.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinit/CloudConfig/cc_update_hostname.py b/cloudinit/CloudConfig/cc_update_hostname.py index c06a434b..6d92157a 100644 --- a/cloudinit/CloudConfig/cc_update_hostname.py +++ b/cloudinit/CloudConfig/cc_update_hostname.py @@ -53,7 +53,7 @@ def read_hostname(filename, default=None): if e.errno == errno.ENOENT: pass return default -def update_hostname(hostname, previous, log): +def update_hostname(hostname, prev_file, log): etc_file = "/etc/hostname" hostname_prev = None -- cgit v1.2.3 From 733c43becee50e29350f17f4b49b4e5a823e6f4f Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 24 Jan 2011 18:46:33 +0000 Subject: cloudinit/__init__: fix get_cpath() --- cloudinit/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index f9b20bb0..d5180c05 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -484,7 +484,7 @@ class CloudInit: # reference, but did not have a cloudinit handle # (ie, no cloudinit.get_cpath()) def get_cpath(self,name=None): - return(get_cpath,name) + return(get_cpath(name)) def initfs(): -- cgit v1.2.3 From 0b7f896201348ab791e89bb9f736d62a2941c14d Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 24 Jan 2011 18:59:32 +0000 Subject: cc_update_hostname: fix error handling --- cloudinit/CloudConfig/cc_update_hostname.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cloudinit/CloudConfig/cc_update_hostname.py b/cloudinit/CloudConfig/cc_update_hostname.py index 6d92157a..3663c0ab 100644 --- a/cloudinit/CloudConfig/cc_update_hostname.py +++ b/cloudinit/CloudConfig/cc_update_hostname.py @@ -17,6 +17,7 @@ # along with this program. If not, see . import cloudinit.util as util import subprocess +import errno from cloudinit.CloudConfig import per_always frequency = per_always @@ -50,7 +51,7 @@ def read_hostname(filename, default=None): if line: return line except IOError, e: - if e.errno == errno.ENOENT: pass + if e.errno != errno.ENOENT: raise return default def update_hostname(hostname, prev_file, log): @@ -61,9 +62,9 @@ def update_hostname(hostname, prev_file, log): try: hostname_prev = read_hostname(prev_file) - except: - log.warn("Failed to open %s" % prev_file) - + except Exception, e: + log.warn("Failed to open %s: %s" % (prev_file, e)) + try: hostname_in_etc = read_hostname(etc_file) except: -- cgit v1.2.3