Revert "Fixes #35622 (#41522)" (#41805)

This reverts commit 8357ae69e7.
This commit is contained in:
James Mighion 2018-06-21 11:52:35 -07:00 committed by Sam Doran
commit 8f4daf84c8

View file

@ -114,14 +114,13 @@ def run_commands(module, commands, check_rc=True):
def load_config(module, commands): def load_config(module, commands):
rc, out, err = exec_command(module, 'config') rc, out, err = exec_command(module, 'config')
if rc != 0: if rc != 0:
module.fail_json(msg='unable to enter configuration mode', err=to_text(out, errors='surrogate_then_replace')) module.fail_json(msg='unable to enter configuration mode', err=to_text(out, errors='surrogate_then_replace'))
commands = to_commands(module, to_list(commands)) for command in to_list(commands):
for command in commands: if command == 'end':
command = module.jsonify(command)
if "\"command\": \"end\"" in command:
continue continue
rc, out, err = exec_command(module, command) rc, out, err = exec_command(module, command)
if rc != 0: if rc != 0: