wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #23360 junos_config set format issue (#23365) (#23373)

Browse source 
(cherry picked from commit 990ba90380)
This commit is contained in:
Ganesh Nalawade 2017-04-06 23:14:50 +05:30 committed by GitHub
parent 4f56567963
commit 3cd89bd8a4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/network/junos/junos_config.py
View file

@ -234,8 +234,6 @@ def filter_delete_statements(module, candidate):
def configure_device(module, warnings): def configure_device(module, warnings):
candidate = module.params['lines'] or module.params['src'] candidate = module.params['lines'] or module.params['src']
if isinstance(candidate, string_types):
candidate = candidate.split('\n')
kwargs = { kwargs = {
'comment': module.params['comment'], 'comment': module.params['comment'],
@ -257,6 +255,9 @@ def configure_device(module, warnings):
else: else:
kwargs.update({'format': config_format, 'action': module.params['update']}) kwargs.update({'format': config_format, 'action': module.params['update']})
if isinstance(candidate, string_types):
candidate = candidate.split('\n')
# this is done to filter out `delete ...` statements which map to # this is done to filter out `delete ...` statements which map to
# nothing in the config as that will cause an exception to be raised # nothing in the config as that will cause an exception to be raised
if any((module.params['lines'], config_format == 'set')): if any((module.params['lines'], config_format == 'set')):