summaryrefslogtreecommitdiff
path: root/cloudinit/config
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-07-28 10:12:02 -0400
committerScott Moser <smoser@ubuntu.com>2015-07-28 10:12:02 -0400
commitf61a62434b36ab873b2b82a5ba69eda826755bfc (patch)
treefd3eb56a29c24ae28efa2a5f9b412a8b224892e8 /cloudinit/config
parent6dd505fd02e0933d8770c8932a927940f6a0e025 (diff)
downloadvyos-cloud-init-f61a62434b36ab873b2b82a5ba69eda826755bfc.tar.gz
vyos-cloud-init-f61a62434b36ab873b2b82a5ba69eda826755bfc.zip
fix bug in remotes_to_rsyslog_cfg, add test
Diffstat (limited to 'cloudinit/config')
-rw-r--r--cloudinit/config/cc_rsyslog.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py
index 8c02e826..915ab420 100644
--- a/cloudinit/config/cc_rsyslog.py
+++ b/cloudinit/config/cc_rsyslog.py
@@ -305,12 +305,12 @@ def remotes_to_rsyslog_cfg(remotes, header=None, footer=None):
lines.append(header)
for name, line in remotes.items():
try:
- lines.append(parse_remotes_line(line, name=name))
+ lines.append(str(parse_remotes_line(line, name=name)))
except ValueError as e:
LOG.warn("failed loading remote %s: %s [%s]", name, line, e)
if footer is not None:
lines.append(footer)
- return '\n'.join(str(lines)) + '\n'
+ return '\n'.join(lines) + "\n"
def handle(name, cfg, cloud, log, _args):