summaryrefslogtreecommitdiff
path: root/network/nxos
diff options
context:
space:
mode:
authorGabriele <gabrielegerbino@gmail.com>2016-09-30 16:21:50 -0400
committerPeter Sprygada <privateip@users.noreply.github.com>2016-09-30 16:21:50 -0400
commit82828fc1a0c036b21fc52406e3f7a03419550ccf (patch)
treed3ee89c5fa0f25f99eaebf6284695b0415652b6f /network/nxos
parenta6c021219e33d1f69eb7ac02489cb6fc7382554c (diff)
downloadansible-modules-core-82828fc1a0c036b21fc52406e3f7a03419550ccf.tar.gz
Fixing nxos_ntp (#5015)
Diffstat (limited to 'network/nxos')
-rw-r--r--network/nxos/nxos_ntp.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/network/nxos/nxos_ntp.py b/network/nxos/nxos_ntp.py
index 81de38be..18cbe2b1 100644
--- a/network/nxos/nxos_ntp.py
+++ b/network/nxos/nxos_ntp.py
@@ -310,10 +310,7 @@ def get_cli_body_ssh(command, response, module):
body = response
else:
try:
- if isinstance(response[0], str):
- body = [json.loads(response[0])]
- else:
- body = response
+ body = [json.loads(response[0])]
except ValueError:
module.fail_json(msg='Command does not support JSON output',
command=command)
@@ -342,7 +339,7 @@ def execute_show(cmds, module, command_type=None):
module.cli.add_commands(cmds, output=command_type)
response = module.cli.run_commands()
else:
- module.cli.add_commands(cmds)
+ module.cli.add_commands(cmds, raw=True)
response = module.cli.run_commands()
except ShellError:
clie = get_exception()
@@ -615,6 +612,8 @@ def main():
changed = True
execute_config_command(cmds, module)
end_state = get_ntp_existing(address, peer_type, module)[0]
+ if 'configure' in cmds:
+ cmds.pop(0)
results = {}
results['proposed'] = proposed