From 7d5dccefe5a7c9816149dcbbbbf9fef29a725acc Mon Sep 17 00:00:00 2001 From: Kedar K <4506537+kedarX@users.noreply.github.com> Date: Fri, 27 Oct 2017 15:31:17 +0530 Subject: [PATCH] - Fix logging module issue where facility is being deleted along with host (#32234) - Remove default facility, as facility is not standard on remote syslog server --- .../modules/network/ios/ios_logging.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/ansible/modules/network/ios/ios_logging.py b/lib/ansible/modules/network/ios/ios_logging.py index 8e1b903c76..47ef5e7485 100644 --- a/lib/ansible/modules/network/ios/ios_logging.py +++ b/lib/ansible/modules/network/ios/ios_logging.py @@ -179,12 +179,12 @@ def map_obj_to_commands(updates, module): return commands -def parse_facility(line): - match = re.search(r'logging facility (\S+)', line, re.M) - if match: - facility = match.group(1) - else: - facility = 'local7' +def parse_facility(line, dest): + facility = None + if dest == 'facility': + match = re.search(r'logging facility (\S+)', line, re.M) + if match: + facility = match.group(1) return facility @@ -242,7 +242,7 @@ def parse_level(line, dest): def map_config_to_obj(module): obj = [] - dest_group = ('console', 'host', 'monitor', 'buffered', 'on') + dest_group = ('console', 'host', 'monitor', 'buffered', 'on', 'facility') data = get_config(module, flags=['| section logging']) @@ -256,10 +256,9 @@ def map_config_to_obj(module): 'dest': dest, 'name': parse_name(line, dest), 'size': parse_size(line, dest), - 'facility': parse_facility(line), + 'facility': parse_facility(line, dest), 'level': parse_level(line, dest) }) - return obj @@ -332,7 +331,7 @@ def main(): dest=dict(type='str', choices=['on', 'host', 'console', 'monitor', 'buffered']), name=dict(type='str'), size=dict(type='int'), - facility=dict(type='str', default='local7'), + facility=dict(type='str'), level=dict(type='str', default='debugging'), state=dict(default='present', choices=['present', 'absent']), )