summaryrefslogtreecommitdiff
path: root/cloudinit/config
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-07-13 11:37:37 -0400
committerGitHub <noreply@github.com>2020-07-13 11:37:37 -0400
commitfecbd81889011e8a75badd18935297f3494fe485 (patch)
treeaf778e3fddd9d42ac2517de4e8a96d0cb628e62e /cloudinit/config
parentb9366677263ff7ec0f5b200900b22ba8871308a3 (diff)
downloadvyos-cloud-init-fecbd81889011e8a75badd18935297f3494fe485.tar.gz
vyos-cloud-init-fecbd81889011e8a75badd18935297f3494fe485.zip
Fix two minor warnings (#475)
Diffstat (limited to 'cloudinit/config')
-rw-r--r--cloudinit/config/cc_puppet.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_puppet.py b/cloudinit/config/cc_puppet.py
index 635c73bc..bc981cf4 100644
--- a/cloudinit/config/cc_puppet.py
+++ b/cloudinit/config/cc_puppet.py
@@ -160,9 +160,9 @@ def handle(name, cfg, cloud, log, _args):
cleaned_lines = [i.lstrip() for i in contents.splitlines()]
cleaned_contents = '\n'.join(cleaned_lines)
# Move to puppet_config.read_file when dropping py2.7
- puppet_config.readfp( # pylint: disable=W1505
+ puppet_config.read_file(
StringIO(cleaned_contents),
- filename=p_constants.conf_path)
+ source=p_constants.conf_path)
for (cfg_name, cfg) in puppet_cfg['conf'].items():
# Cert configuration is a special case
# Dump the puppet master ca certificate in the correct place