cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixes bug introduced in 3670215 in junos_config (#5251)

Browse source 
The previous fix created a new bug that this PR resolves
This commit is contained in:
Peter Sprygada 2016-10-13 15:06:50 -04:00 committed by Matt Clay
parent 25b6492d37
commit 2127459794
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,7 +217,7 @@ def diff_commands(commands, config):
updates = list() updates = list()
visited = set() visited = set()
for item in commands.split('\n'): for item in commands:
if len(item) > 0: if len(item) > 0:
if not item.startswith('set') and not item.startswith('delete'): if not item.startswith('set') and not item.startswith('delete'):
raise ValueError('line must start with either `set` or `delete`') raise ValueError('line must start with either `set` or `delete`')
@ -235,6 +235,8 @@ def diff_commands(commands, config):
def load_config(module, result): def load_config(module, result):
candidate = module.params['lines'] or module.params['src'] candidate = module.params['lines'] or module.params['src']
if isinstance(candidate, basestring):
candidate = candidate.split('\n')
kwargs = dict() kwargs = dict()
kwargs['comment'] = module.params['comment'] kwargs['comment'] = module.params['comment']