From 55472eb02eaa5b88676a96e006f6838020f8ffe3 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 28 Jul 2015 11:44:32 -0400
Subject: rsyslog: skip empty or None in remotes format

This allows user to specify the following to overwrite a previously
declared entry without warnings.
 rsyslog: {'remotes': {'foo': None}}
---
 cloudinit/config/cc_rsyslog.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cloudinit')

diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py
index 5ecf1629..a0132d28 100644
--- a/cloudinit/config/cc_rsyslog.py
+++ b/cloudinit/config/cc_rsyslog.py
@@ -307,6 +307,8 @@ def remotes_to_rsyslog_cfg(remotes, header=None, footer=None):
     if header is not None:
         lines.append(header)
     for name, line in remotes.items():
+        if not line:
+            continue
         try:
             lines.append(str(parse_remotes_line(line, name=name)))
         except ValueError as e:
-- 
cgit v1.2.3