summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_chef.py
diff options
context:
space:
mode:
authorDominic Schlegel <dominic.schlegel@hostpoint.ch>2019-10-17 14:36:40 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-10-17 14:36:40 +0000
commit7e699256b319cdf41e747211763e593a6b5f3393 (patch)
tree25b780ce0db9a766d017a5c9913ee723fd82731e /cloudinit/config/cc_chef.py
parentfac98983187c0984aa79c569c4b76cab90fd6f47 (diff)
downloadvyos-cloud-init-7e699256b319cdf41e747211763e593a6b5f3393.tar.gz
vyos-cloud-init-7e699256b319cdf41e747211763e593a6b5f3393.zip
replace any deprecated log.warn with log.warning
Commit 6797e822959b84c98cf73e02b2a6e3d6ab3fd4fe replaced the LOG.warn calls that linters were warning about; this also replaces calls that linters would not have recognised (as `log` is generally a parameter in these scenarios). LP: #1508442
Diffstat (limited to 'cloudinit/config/cc_chef.py')
-rw-r--r--cloudinit/config/cc_chef.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index a6240306..0ad6b7f1 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -196,7 +196,7 @@ def handle(name, cfg, cloud, log, _args):
# If there isn't a chef key in the configuration don't do anything
if 'chef' not in cfg:
log.debug(("Skipping module named %s,"
- " no 'chef' key in configuration"), name)
+ " no 'chef' key in configuration"), name)
return
chef_cfg = cfg['chef']
@@ -215,9 +215,9 @@ 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 "
- "validation_key path '%s' does not exist.",
- vkey_path)
+ log.warning("chef validation_cert provided as 'system', but "
+ "validation_key path '%s' does not exist.",
+ vkey_path)
# Create the chef config from template
template_fn = cloud.get_template_filename('chef_client.rb')
@@ -234,8 +234,8 @@ 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",
- CHEF_RB_PATH)
+ log.warning("No template found, not rendering to %s",
+ CHEF_RB_PATH)
# Set the firstboot json
fb_filename = util.get_cfg_option_str(chef_cfg, 'firstboot_path',
@@ -276,9 +276,9 @@ 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"
- " 'exec_arguments' expected list, tuple,"
- " or string", type(cmd_args))
+ log.warning("Unknown type %s provided for chef"
+ " 'exec_arguments' expected list, tuple,"
+ " or string", type(cmd_args))
cmd.extend(CHEF_EXEC_DEF_ARGS)
else:
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