summaryrefslogtreecommitdiff
path: root/cloudinit/config
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-07-28 10:48:32 -0400
committerScott Moser <smoser@ubuntu.com>2015-07-28 10:48:32 -0400
commit0a581732a40ff814b1fc0dace9f519b7a5c779e6 (patch)
tree86c39a28d09e142fdadeefd549c4e9b4c17f40ca /cloudinit/config
parentc6e7fb1752a93ed534080adf0588e4c7cdd99071 (diff)
downloadvyos-cloud-init-0a581732a40ff814b1fc0dace9f519b7a5c779e6.tar.gz
vyos-cloud-init-0a581732a40ff814b1fc0dace9f519b7a5c779e6.zip
must declare proto of '@'
Diffstat (limited to 'cloudinit/config')
-rw-r--r--cloudinit/config/cc_rsyslog.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py
index 2bb00728..5ecf1629 100644
--- a/cloudinit/config/cc_rsyslog.py
+++ b/cloudinit/config/cc_rsyslog.py
@@ -251,6 +251,8 @@ class SyslogRemotesLine(object):
match = "*.*"
self.name = name
self.match = match
+ if not proto:
+ proto = "udp"
if proto == "@":
proto = "udp"
elif proto == "@@":
@@ -281,9 +283,9 @@ class SyslogRemotesLine(object):
def __str__(self):
buf = self.match + " "
if self.proto == "udp":
- buf += " @"
+ buf += "@"
elif self.proto == "tcp":
- buf += " @@"
+ buf += "@@"
if ":" in self.addr:
buf += "[" + self.addr + "]"