From 85d5753d549e2d6ff69bbcc946e37d8fdac44868 Mon Sep 17 00:00:00 2001 From: harlowja Date: Fri, 22 Jun 2012 22:04:37 -0700 Subject: 1. Adjust the logging of phone home module when its not enabled 2. Fix pylint warning in userdata about unused variable --- cloudinit/config/cc_phone_home.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cloudinit/config') diff --git a/cloudinit/config/cc_phone_home.py b/cloudinit/config/cc_phone_home.py index d929eb64..ae1349eb 100644 --- a/cloudinit/config/cc_phone_home.py +++ b/cloudinit/config/cc_phone_home.py @@ -49,6 +49,8 @@ def handle(name, cfg, cloud, log, args): ph_cfg = util.read_conf(args[0]) else: if not 'phone_home' in cfg: + log.debug(("Skipping module named %s, " + "no 'phone_home' configuration found"), name) return ph_cfg = cfg['phone_home'] @@ -59,7 +61,7 @@ def handle(name, cfg, cloud, log, args): url = ph_cfg['url'] post_list = ph_cfg.get('post', 'all') - tries = ph_cfg.get('tries', 10) + tries = ph_cfg.get('tries') try: tries = int(tries) except: -- cgit v1.2.3