summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKedar K <4506537+kedarX@users.noreply.github.com>2017-10-27 15:54:20 +0530
committerGitHub <noreply@github.com>2017-10-27 15:54:20 +0530
commita9e1be7b067379f16218dd1e58f5b13a0e819846 (patch)
tree4de18482190d19365ba69cce46a18d6652abb28d
parent7d5dccefe5a7c9816149dcbbbbf9fef29a725acc (diff)
downloadansible-revert-32234-fix32225.tar.gz
Revert "- Fix logging module issue where facility is being deleted along with host (#32234)"revert-32234-fix32225
This reverts commit 7d5dccefe5a7c9816149dcbbbbf9fef29a725acc.
-rw-r--r--lib/ansible/modules/network/ios/ios_logging.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/ansible/modules/network/ios/ios_logging.py b/lib/ansible/modules/network/ios/ios_logging.py
index 47ef5e7485..8e1b903c76 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, dest):
- facility = None
- if dest == 'facility':
- match = re.search(r'logging facility (\S+)', line, re.M)
- if match:
- facility = match.group(1)
+def parse_facility(line):
+ match = re.search(r'logging facility (\S+)', line, re.M)
+ if match:
+ facility = match.group(1)
+ else:
+ facility = 'local7'
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', 'facility')
+ dest_group = ('console', 'host', 'monitor', 'buffered', 'on')
data = get_config(module, flags=['| section logging'])
@@ -256,9 +256,10 @@ def map_config_to_obj(module):
'dest': dest,
'name': parse_name(line, dest),
'size': parse_size(line, dest),
- 'facility': parse_facility(line, dest),
+ 'facility': parse_facility(line),
'level': parse_level(line, dest)
})
+
return obj
@@ -331,7 +332,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'),
+ facility=dict(type='str', default='local7'),
level=dict(type='str', default='debugging'),
state=dict(default='present', choices=['present', 'absent']),
)