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

Fixing nxos_vtp_version (#5038)

Browse source
This commit is contained in:
Gabriele 2016-09-30 16:16:10 -04:00 committed by Matt Clay
parent 66a1b15f89
commit b897b497c1
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/network/nxos/nxos_vtp_version.py
View file

@ -264,10 +264,7 @@ def get_cli_body_ssh(command, response, module):
body = response body = response
else: else:
try: try:
if isinstance(response[0], str):
body = [json.loads(response[0])] body = [json.loads(response[0])]
else:
body = response
except ValueError: except ValueError:
module.fail_json(msg='Command does not support JSON output', module.fail_json(msg='Command does not support JSON output',
command=command) command=command)
@ -296,7 +293,7 @@ def execute_show(cmds, module, command_type=None):
module.cli.add_commands(cmds, output=command_type) module.cli.add_commands(cmds, output=command_type)
response = module.cli.run_commands() response = module.cli.run_commands()
else: else:
module.cli.add_commands(cmds) module.cli.add_commands(cmds, raw=True)
response = module.cli.run_commands() response = module.cli.run_commands()
except ShellError: except ShellError:
clie = get_exception() clie = get_exception()
@ -400,6 +397,8 @@ def main():
changed = True changed = True
execute_config_command(cmds, module) execute_config_command(cmds, module)
end_state = get_vtp_config(module) end_state = get_vtp_config(module)
if 'configure' in cmds:
cmds.pop(0)
results = {} results = {}
results['proposed'] = proposed results['proposed'] = proposed