cloud-init-dev team mailing list archive
-
cloud-init-dev team
-
Mailing list archive
-
Message #06797
[Merge] ~d-info-e/cloud-init:fix-log-warn into cloud-init:master
do3meli has proposed merging ~d-info-e/cloud-init:fix-log-warn into cloud-init:master.
Requested reviews:
cloud-init Commiters (cloud-init-dev)
Related bugs:
Bug #1508442 in cloud-init: "LOG.warn is deprecated"
https://bugs.launchpad.net/cloud-init/+bug/1508442
For more details, see:
https://code.launchpad.net/~d-info-e/cloud-init/+git/cloud-init/+merge/374215
--
Your team cloud-init Commiters is requested to review the proposed merge of ~d-info-e/cloud-init:fix-log-warn into cloud-init:master.
diff --git a/cloudinit/config/cc_apt_pipelining.py b/cloudinit/config/cc_apt_pipelining.py
index 459332a..225d090 100644
--- a/cloudinit/config/cc_apt_pipelining.py
+++ b/cloudinit/config/cc_apt_pipelining.py
@@ -59,7 +59,7 @@ def handle(_name, cfg, _cloud, log, _args):
elif apt_pipe_value_s in [str(b) for b in range(0, 6)]:
write_apt_snippet(apt_pipe_value_s, log, DEFAULT_FILE)
else:
- log.warn("Invalid option for apt_pipelining: %s", apt_pipe_value)
+ log.warning("Invalid option for apt_pipelining: %s", apt_pipe_value)
def write_apt_snippet(setting, log, f_name):
diff --git a/cloudinit/config/cc_byobu.py b/cloudinit/config/cc_byobu.py
index 8570da1..8334e5f 100755
--- a/cloudinit/config/cc_byobu.py
+++ b/cloudinit/config/cc_byobu.py
@@ -60,7 +60,7 @@ def handle(name, cfg, cloud, log, args):
valid = ("enable-user", "enable-system", "enable",
"disable-user", "disable-system", "disable")
if value not in valid:
- log.warn("Unknown value %s for byobu_by_default", value)
+ log.warning("Unknown value %s for byobu_by_default", value)
mod_user = value.endswith("-user")
mod_sys = value.endswith("-system")
@@ -80,7 +80,7 @@ def handle(name, cfg, cloud, log, args):
(users, _groups) = ug_util.normalize_users_groups(cfg, cloud.distro)
(user, _user_config) = ug_util.extract_default(users)
if not user:
- log.warn(("No default byobu user provided, "
+ log.warning(("No default byobu user provided, "
"can not launch %s for the default user"), bl_inst)
else:
shcmd += " sudo -Hu \"%s\" byobu-launcher-%s" % (user, bl_inst)
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index a624030..7edb881 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -215,7 +215,7 @@ def handle(name, cfg, cloud, log, _args):
if vcert != "system":
util.write_file(vkey_path, vcert)
elif not os.path.isfile(vkey_path):
- log.warn("chef validation_cert provided as 'system', but "
+ log.warning("chef validation_cert provided as 'system', but "
"validation_key path '%s' does not exist.",
vkey_path)
@@ -234,7 +234,7 @@ def handle(name, cfg, cloud, log, _args):
util.ensure_dirs(param_paths)
templater.render_to_file(template_fn, CHEF_RB_PATH, params)
else:
- log.warn("No template found, not rendering to %s",
+ log.warning("No template found, not rendering to %s",
CHEF_RB_PATH)
# Set the firstboot json
@@ -276,7 +276,7 @@ def run_chef(chef_cfg, log):
elif isinstance(cmd_args, six.string_types):
cmd.append(cmd_args)
else:
- log.warn("Unknown type %s provided for chef"
+ log.warning("Unknown type %s provided for chef"
" 'exec_arguments' expected list, tuple,"
" or string", type(cmd_args))
cmd.extend(CHEF_EXEC_DEF_ARGS)
@@ -334,7 +334,7 @@ def install_chef(cloud, chef_cfg, log):
retries=util.get_cfg_option_int(chef_cfg, "omnibus_url_retries"),
omnibus_version=omnibus_version)
else:
- log.warn("Unknown chef install type '%s'", install_type)
+ log.warning("Unknown chef install type '%s'", install_type)
run = False
return run
diff --git a/cloudinit/config/cc_emit_upstart.py b/cloudinit/config/cc_emit_upstart.py
index eb9fbe6..b342e04 100644
--- a/cloudinit/config/cc_emit_upstart.py
+++ b/cloudinit/config/cc_emit_upstart.py
@@ -69,6 +69,6 @@ def handle(name, _cfg, cloud, log, args):
util.subp(cmd)
except Exception as e:
# TODO(harlowja), use log exception from utils??
- log.warn("Emission of upstart event %s failed due to: %s", n, e)
+ log.warning("Emission of upstart event %s failed due to: %s", n, e)
# vi: ts=4 expandtab
diff --git a/cloudinit/config/cc_final_message.py b/cloudinit/config/cc_final_message.py
index c61f03d..fd14154 100644
--- a/cloudinit/config/cc_final_message.py
+++ b/cloudinit/config/cc_final_message.py
@@ -83,6 +83,6 @@ def handle(_name, cfg, cloud, log, args):
util.logexc(log, "Failed to write boot finished file %s", boot_fin_fn)
if cloud.datasource.is_disconnected:
- log.warn("Used fallback datasource")
+ log.warning("Used fallback datasource")
# vi: ts=4 expandtab
diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py
index 564f376..aa9716e 100644
--- a/cloudinit/config/cc_growpart.py
+++ b/cloudinit/config/cc_growpart.py
@@ -321,7 +321,7 @@ def handle(_name, cfg, _cloud, log, _args):
mycfg = cfg.get('growpart')
if not isinstance(mycfg, dict):
- log.warn("'growpart' in config was not a dict")
+ log.warning("'growpart' in config was not a dict")
return
mode = mycfg.get('mode', "auto")
diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py
index aff4010..c874756 100644
--- a/cloudinit/config/cc_keys_to_console.py
+++ b/cloudinit/config/cc_keys_to_console.py
@@ -52,7 +52,7 @@ def _get_helper_tool_path(distro):
def handle(name, cfg, cloud, log, _args):
helper_path = _get_helper_tool_path(cloud.distro)
if not os.path.exists(helper_path):
- log.warn(("Unable to activate module %s,"
+ log.warning(("Unable to activate module %s,"
" helper tool not found at %s"), name, helper_path)
return
@@ -68,7 +68,7 @@ def handle(name, cfg, cloud, log, _args):
util.multi_log("%s\n" % (stdout.strip()),
stderr=False, console=True)
except Exception:
- log.warn("Writing keys to the system console failed!")
+ log.warning("Writing keys to the system console failed!")
raise
# vi: ts=4 expandtab
diff --git a/cloudinit/config/cc_lxd.py b/cloudinit/config/cc_lxd.py
index d983077..c37ba61 100644
--- a/cloudinit/config/cc_lxd.py
+++ b/cloudinit/config/cc_lxd.py
@@ -66,20 +66,20 @@ def handle(name, cfg, cloud, log, args):
name)
return
if not isinstance(lxd_cfg, dict):
- log.warn("lxd config must be a dictionary. found a '%s'",
+ log.warning("lxd config must be a dictionary. found a '%s'",
type(lxd_cfg))
return
# Grab the configuration
init_cfg = lxd_cfg.get('init')
if not isinstance(init_cfg, dict):
- log.warn("lxd/init config must be a dictionary. found a '%s'",
+ log.warning("lxd/init config must be a dictionary. found a '%s'",
type(init_cfg))
init_cfg = {}
bridge_cfg = lxd_cfg.get('bridge', {})
if not isinstance(bridge_cfg, dict):
- log.warn("lxd/bridge config must be a dictionary. found a '%s'",
+ log.warning("lxd/bridge config must be a dictionary. found a '%s'",
type(bridge_cfg))
bridge_cfg = {}
@@ -95,7 +95,7 @@ def handle(name, cfg, cloud, log, args):
try:
cloud.distro.install_packages(packages)
except util.ProcessExecutionError as exc:
- log.warn("failed to install packages %s: %s", packages, exc)
+ log.warning("failed to install packages %s: %s", packages, exc)
return
# Set up lxd if init config is given
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
index 123ffb8..48ac881 100644
--- a/cloudinit/config/cc_mounts.py
+++ b/cloudinit/config/cc_mounts.py
@@ -347,7 +347,7 @@ def handle(_name, cfg, cloud, log, _args):
for i in range(len(cfgmnt)):
# skip something that wasn't a list
if not isinstance(cfgmnt[i], list):
- log.warn("Mount option %s not a list, got a %s instead",
+ log.warning("Mount option %s not a list, got a %s instead",
(i + 1), type_utils.obj_name(cfgmnt[i]))
continue
@@ -495,7 +495,7 @@ def handle(_name, cfg, cloud, log, _args):
util.subp(cmd)
log.debug(fmt, "PASS")
except util.ProcessExecutionError:
- log.warn(fmt, "FAIL")
+ log.warning(fmt, "FAIL")
util.logexc(log, fmt, "FAIL")
# vi: ts=4 expandtab
diff --git a/cloudinit/config/cc_package_update_upgrade_install.py b/cloudinit/config/cc_package_update_upgrade_install.py
index 17b9101..b89157f 100644
--- a/cloudinit/config/cc_package_update_upgrade_install.py
+++ b/cloudinit/config/cc_package_update_upgrade_install.py
@@ -108,7 +108,7 @@ def handle(_name, cfg, cloud, log, _args):
reboot_fn_exists = os.path.isfile(REBOOT_FILE)
if (upgrade or pkglist) and reboot_if_required and reboot_fn_exists:
try:
- log.warn("Rebooting after upgrade or install per %s", REBOOT_FILE)
+ log.warning("Rebooting after upgrade or install per %s", REBOOT_FILE)
# Flush the above warning + anything else out...
logging.flushLoggers(log)
_fire_reboot(log)
@@ -117,7 +117,7 @@ def handle(_name, cfg, cloud, log, _args):
errors.append(e)
if len(errors):
- log.warn("%s failed with exceptions, re-raising the last one",
+ log.warning("%s failed with exceptions, re-raising the last one",
len(errors))
raise errors[-1]
diff --git a/cloudinit/config/cc_phone_home.py b/cloudinit/config/cc_phone_home.py
index 3be0d1c..6d2b5b0 100644
--- a/cloudinit/config/cc_phone_home.py
+++ b/cloudinit/config/cc_phone_home.py
@@ -79,7 +79,7 @@ def handle(name, cfg, cloud, log, args):
ph_cfg = cfg['phone_home']
if 'url' not in ph_cfg:
- log.warn(("Skipping module named %s, "
+ log.warning(("Skipping module named %s, "
"no 'url' found in 'phone_home' configuration"), name)
return
@@ -120,7 +120,7 @@ def handle(name, cfg, cloud, log, args):
submit_keys[k] = all_keys[k]
else:
submit_keys[k] = None
- log.warn(("Requested key %s from 'post'"
+ log.warning(("Requested key %s from 'post'"
" configuration list not available"), k)
# Get them read to be posted
diff --git a/cloudinit/config/cc_power_state_change.py b/cloudinit/config/cc_power_state_change.py
index 50b3747..ef60170 100644
--- a/cloudinit/config/cc_power_state_change.py
+++ b/cloudinit/config/cc_power_state_change.py
@@ -103,12 +103,12 @@ def check_condition(cond, log=None):
return False
else:
if log:
- log.warn(pre + "unexpected exit %s. " % ret +
+ log.warning(pre + "unexpected exit %s. " % ret +
"do not apply change.")
return False
except Exception as e:
if log:
- log.warn(pre + "Unexpected error: %s" % e)
+ log.warning(pre + "Unexpected error: %s" % e)
return False
@@ -120,7 +120,7 @@ def handle(_name, cfg, _cloud, log, _args):
log.debug("no power_state provided. doing nothing")
return
except Exception as e:
- log.warn("%s Not performing power state change!" % str(e))
+ log.warning("%s Not performing power state change!" % str(e))
return
if condition is False:
@@ -131,7 +131,7 @@ def handle(_name, cfg, _cloud, log, _args):
cmdline = givecmdline(mypid)
if not cmdline:
- log.warn("power_state: failed to get cmdline of current process")
+ log.warning("power_state: failed to get cmdline of current process")
return
devnull_fp = open(os.devnull, "w")
@@ -214,7 +214,7 @@ def run_after_pid_gone(pid, pidcmdline, timeout, log, condition, func, args):
def fatal(msg):
if log:
- log.warn(msg)
+ log.warning(msg)
doexit(EXIT_FAIL)
known_errnos = (errno.ENOENT, errno.ESRCH)
diff --git a/cloudinit/config/cc_puppet.py b/cloudinit/config/cc_puppet.py
index 4190a20..1ef1a26 100644
--- a/cloudinit/config/cc_puppet.py
+++ b/cloudinit/config/cc_puppet.py
@@ -98,7 +98,7 @@ def _autostart_puppet(log):
elif os.path.exists('/sbin/chkconfig'):
util.subp(['/sbin/chkconfig', 'puppet', 'on'], capture=False)
else:
- log.warn(("Sorry we do not know how to enable"
+ log.warning(("Sorry we do not know how to enable"
" puppet services on this system"))
@@ -121,7 +121,7 @@ def handle(name, cfg, cloud, log, _args):
p_constants = PuppetConstants(conf_file, ssl_dir, log)
if not install and version:
- log.warn(("Puppet install set false but version supplied,"
+ log.warning(("Puppet install set false but version supplied,"
" doing nothing."))
elif install:
log.debug(("Attempting to install puppet %s,"),
diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py
index afd2e06..bd72a34 100644
--- a/cloudinit/config/cc_resizefs.py
+++ b/cloudinit/config/cc_resizefs.py
@@ -183,7 +183,7 @@ def maybe_get_writable_device_path(devpath, info, log):
not container):
devpath = util.rootdev_from_cmdline(util.get_cmdline())
if devpath is None:
- log.warn("Unable to find device '/dev/root'")
+ log.warning("Unable to find device '/dev/root'")
return None
log.debug("Converted /dev/root to '%s' per kernel cmdline", devpath)
@@ -212,7 +212,7 @@ def maybe_get_writable_device_path(devpath, info, log):
log.debug("Device '%s' did not exist in container. "
"cannot resize: %s", devpath, info)
elif exc.errno == errno.ENOENT:
- log.warn("Device '%s' did not exist. cannot resize: %s",
+ log.warning("Device '%s' did not exist. cannot resize: %s",
devpath, info)
else:
raise exc
@@ -223,7 +223,7 @@ def maybe_get_writable_device_path(devpath, info, log):
log.debug("device '%s' not a block device in container."
" cannot resize: %s" % (devpath, info))
else:
- log.warn("device '%s' not a block device. cannot resize: %s" %
+ log.warning("device '%s' not a block device. cannot resize: %s" %
(devpath, info))
return None
return devpath # The writable block devpath
@@ -243,7 +243,7 @@ def handle(name, cfg, _cloud, log, args):
resize_what = "/"
result = util.get_mount_info(resize_what, log)
if not result:
- log.warn("Could not determine filesystem type of %s", resize_what)
+ log.warning("Could not determine filesystem type of %s", resize_what)
return
(devpth, fs_type, mount_point) = result
@@ -280,7 +280,7 @@ def handle(name, cfg, _cloud, log, args):
break
if not resizer:
- log.warn("Not resizing unknown filesystem type %s for %s",
+ log.warning("Not resizing unknown filesystem type %s for %s",
fs_type, resize_what)
return
diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py
index 9812562..69f4768 100644
--- a/cloudinit/config/cc_resolv_conf.py
+++ b/cloudinit/config/cc_resolv_conf.py
@@ -102,11 +102,11 @@ def handle(name, cfg, cloud, log, _args):
return
if "resolv_conf" not in cfg:
- log.warn("manage_resolv_conf True but no parameters provided!")
+ log.warning("manage_resolv_conf True but no parameters provided!")
template_fn = cloud.get_template_filename('resolv.conf')
if not template_fn:
- log.warn("No template found, not rendering /etc/resolv.conf")
+ log.warning("No template found, not rendering /etc/resolv.conf")
return
generate_resolv_conf(template_fn=template_fn, params=cfg["resolv_conf"])
diff --git a/cloudinit/config/cc_rightscale_userdata.py b/cloudinit/config/cc_rightscale_userdata.py
index 4e34c7e..abffea3 100644
--- a/cloudinit/config/cc_rightscale_userdata.py
+++ b/cloudinit/config/cc_rightscale_userdata.py
@@ -111,7 +111,7 @@ def handle(name, _cfg, cloud, log, _args):
log.debug("%s urls were skipped or failed", skipped)
if captured_excps:
- log.warn("%s failed with exceptions, re-raising the last one",
+ log.warning("%s failed with exceptions, re-raising the last one",
len(captured_excps))
raise captured_excps[-1]
diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py
index 22b1753..ff211f6 100644
--- a/cloudinit/config/cc_rsyslog.py
+++ b/cloudinit/config/cc_rsyslog.py
@@ -432,7 +432,7 @@ def handle(name, cfg, cloud, log, _args):
systemd=cloud.distro.uses_systemd()),
except util.ProcessExecutionError as e:
restarted = False
- log.warn("Failed to reload syslog", e)
+ log.warning("Failed to reload syslog", e)
if restarted:
# This only needs to run if we *actually* restarted
diff --git a/cloudinit/config/cc_scripts_per_boot.py b/cloudinit/config/cc_scripts_per_boot.py
index b03255c..ae6cefa 100644
--- a/cloudinit/config/cc_scripts_per_boot.py
+++ b/cloudinit/config/cc_scripts_per_boot.py
@@ -40,7 +40,7 @@ def handle(name, _cfg, cloud, log, _args):
try:
util.runparts(runparts_path)
except Exception:
- log.warn("Failed to run module %s (%s in %s)",
+ log.warning("Failed to run module %s (%s in %s)",
name, SCRIPT_SUBDIR, runparts_path)
raise
diff --git a/cloudinit/config/cc_scripts_per_instance.py b/cloudinit/config/cc_scripts_per_instance.py
index baee5cc..a61e13d 100644
--- a/cloudinit/config/cc_scripts_per_instance.py
+++ b/cloudinit/config/cc_scripts_per_instance.py
@@ -40,7 +40,7 @@ def handle(name, _cfg, cloud, log, _args):
try:
util.runparts(runparts_path)
except Exception:
- log.warn("Failed to run module %s (%s in %s)",
+ log.warning("Failed to run module %s (%s in %s)",
name, SCRIPT_SUBDIR, runparts_path)
raise
diff --git a/cloudinit/config/cc_scripts_per_once.py b/cloudinit/config/cc_scripts_per_once.py
index 4943e9a..0f9b4a6 100644
--- a/cloudinit/config/cc_scripts_per_once.py
+++ b/cloudinit/config/cc_scripts_per_once.py
@@ -40,7 +40,7 @@ def handle(name, _cfg, cloud, log, _args):
try:
util.runparts(runparts_path)
except Exception:
- log.warn("Failed to run module %s (%s in %s)",
+ log.warning("Failed to run module %s (%s in %s)",
name, SCRIPT_SUBDIR, runparts_path)
raise
diff --git a/cloudinit/config/cc_scripts_user.py b/cloudinit/config/cc_scripts_user.py
index 6c66481..3103eb7 100644
--- a/cloudinit/config/cc_scripts_user.py
+++ b/cloudinit/config/cc_scripts_user.py
@@ -44,7 +44,7 @@ def handle(name, _cfg, cloud, log, _args):
try:
util.runparts(runparts_path)
except Exception:
- log.warn("Failed to run module %s (%s in %s)",
+ log.warning("Failed to run module %s (%s in %s)",
name, SCRIPT_SUBDIR, runparts_path)
raise
diff --git a/cloudinit/config/cc_scripts_vendor.py b/cloudinit/config/cc_scripts_vendor.py
index 0292eaf..c50be8e 100644
--- a/cloudinit/config/cc_scripts_vendor.py
+++ b/cloudinit/config/cc_scripts_vendor.py
@@ -48,7 +48,7 @@ def handle(name, cfg, cloud, log, _args):
try:
util.runparts(runparts_path, exe_prefix=prefix)
except Exception:
- log.warn("Failed to run module %s (%s in %s)",
+ log.warning("Failed to run module %s (%s in %s)",
name, SCRIPT_SUBDIR, runparts_path)
raise
diff --git a/cloudinit/config/cc_seed_random.py b/cloudinit/config/cc_seed_random.py
index 65f6e77..a5d7c73 100644
--- a/cloudinit/config/cc_seed_random.py
+++ b/cloudinit/config/cc_seed_random.py
@@ -131,7 +131,7 @@ def handle(name, cfg, cloud, log, _args):
env['RANDOM_SEED_FILE'] = seed_path
handle_random_seed_command(command=command, required=req, env=env)
except ValueError as e:
- log.warn("handling random command [%s] failed: %s", command, e)
+ log.warning("handling random command [%s] failed: %s", command, e)
raise e
# vi: ts=4 expandtab
diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
index cf9b5ab..1379428 100755
--- a/cloudinit/config/cc_set_passwords.py
+++ b/cloudinit/config/cc_set_passwords.py
@@ -164,7 +164,7 @@ def handle(_name, cfg, cloud, log, args):
if user:
plist = ["%s:%s" % (user, password)]
else:
- log.warn("No default or defined user to change password for.")
+ log.warning("No default or defined user to change password for.")
errors = []
if plist:
diff --git a/cloudinit/config/cc_update_etc_hosts.py b/cloudinit/config/cc_update_etc_hosts.py
index c96eede..e54af04 100644
--- a/cloudinit/config/cc_update_etc_hosts.py
+++ b/cloudinit/config/cc_update_etc_hosts.py
@@ -62,7 +62,7 @@ def handle(name, cfg, cloud, log, _args):
if util.translate_bool(manage_hosts, addons=['template']):
(hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud)
if not hostname:
- log.warn(("Option 'manage_etc_hosts' was set,"
+ log.warning(("Option 'manage_etc_hosts' was set,"
" but no hostname was found"))
return
@@ -80,7 +80,7 @@ def handle(name, cfg, cloud, log, _args):
elif manage_hosts == "localhost":
(hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud)
if not hostname:
- log.warn(("Option 'manage_etc_hosts' was set,"
+ log.warning(("Option 'manage_etc_hosts' was set,"
" but no hostname was found"))
return
diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
index 6a42f49..251aca8 100644
--- a/cloudinit/config/cc_yum_add_repo.py
+++ b/cloudinit/config/cc_yum_add_repo.py
@@ -113,7 +113,7 @@ def handle(name, cfg, _cloud, log, _args):
missing_required = 0
for req_field in ['baseurl']:
if req_field not in repo_config:
- log.warn(("Repository %s does not contain a %s"
+ log.warning(("Repository %s does not contain a %s"
" configuration 'required' entry"),
repo_id, req_field)
missing_required += 1
@@ -121,7 +121,7 @@ def handle(name, cfg, _cloud, log, _args):
repo_configs[canon_repo_id] = repo_config
repo_locations[canon_repo_id] = repo_fn_pth
else:
- log.warn("Repository %s is missing %s required fields, skipping!",
+ log.warning("Repository %s is missing %s required fields, skipping!",
repo_id, missing_required)
for (c_repo_id, path) in repo_locations.items():
repo_blob = _format_repository_config(c_repo_id,
Follow ups