Merge pull request #4708 from privateip/fix-4707
fixes issue where the configobjs are not deserialized to a list
This commit is contained in:
commit
635fa22753
3 changed files with 6 additions and 6 deletions
|
@ -288,7 +288,7 @@ def load_config(module, commands, result):
|
|||
if not module.check_mode and module.params['update'] != 'check':
|
||||
module.config(commands)
|
||||
result['changed'] = module.params['update'] != 'check'
|
||||
result['updates'] = commands.split('\n')
|
||||
result['updates'] = commands
|
||||
|
||||
def run(module, result):
|
||||
match = module.params['match']
|
||||
|
@ -304,7 +304,7 @@ def run(module, result):
|
|||
configobjs = candidate.items
|
||||
|
||||
if configobjs:
|
||||
commands = dumps(configobjs, 'commands')
|
||||
commands = dumps(configobjs, 'commands').split('\n')
|
||||
|
||||
if module.params['before']:
|
||||
commands[:0] = module.params['before']
|
||||
|
|
|
@ -264,7 +264,7 @@ def run(module, result):
|
|||
configobjs = candidate.items
|
||||
|
||||
if configobjs:
|
||||
commands = dumps(configobjs, 'commands')
|
||||
commands = dumps(configobjs, 'commands').split('\n')
|
||||
|
||||
if module.params['before']:
|
||||
commands[:0] = module.params['before']
|
||||
|
@ -272,7 +272,7 @@ def run(module, result):
|
|||
if module.params['after']:
|
||||
commands.extend(module.params['after'])
|
||||
|
||||
result['updates'] = commands.split('\n')
|
||||
result['updates'] = commands
|
||||
|
||||
if update != 'check':
|
||||
load_config(module, commands, result)
|
||||
|
|
|
@ -237,7 +237,7 @@ def load_config(module, commands, result):
|
|||
if not module.check_mode and module.params['update'] != 'check':
|
||||
module.config(commands)
|
||||
result['changed'] = module.params['update'] != 'check'
|
||||
result['updates'] = commands.split('\n')
|
||||
result['updates'] = commands
|
||||
|
||||
def run(module, result):
|
||||
match = module.params['match']
|
||||
|
@ -253,7 +253,7 @@ def run(module, result):
|
|||
configobjs = candidate.items
|
||||
|
||||
if configobjs:
|
||||
commands = dumps(configobjs, 'commands')
|
||||
commands = dumps(configobjs, 'commands').split('\n')
|
||||
|
||||
if module.params['before']:
|
||||
commands[:0] = module.params['before']
|
||||
|
|
Loading…
Reference in a new issue