diff --git a/lib/ansible/modules/network/ios/ios_command.py b/lib/ansible/modules/network/ios/ios_command.py index 4204a73a682..c5923e4e2b0 100644 --- a/lib/ansible/modules/network/ios/ios_command.py +++ b/lib/ansible/modules/network/ios/ios_command.py @@ -148,12 +148,6 @@ from ansible.module_utils.six import string_types VALID_KEYS = ['command', 'prompt', 'response'] -def to_lines(stdout): - for item in stdout: - if isinstance(item, string_types): - item = str(item).split('\n') - yield item - def parse_commands(module): for cmd in module.params['commands']: if isinstance(cmd, string_types): @@ -216,7 +210,9 @@ def main(): module.fail_json(msg=str(exc), failed_conditions=exc.failed_conditions) except NetworkError: exc = get_exception() - module.fail_json(msg=str(exc)) + module.disconnect() + module.fail_json(msg=str(exc), stdout=exc.kwargs.get('stdout')) + result = dict(changed=False, stdout=list()) @@ -228,7 +224,6 @@ def main(): result['stdout'].append(output) result['warnings'] = warnings - result['stdout_lines'] = list(to_lines(result['stdout'])) module.exit_json(**result) diff --git a/lib/ansible/modules/network/ios/ios_config.py b/lib/ansible/modules/network/ios/ios_config.py index 26a318de378..f7a2d5e6754 100644 --- a/lib/ansible/modules/network/ios/ios_config.py +++ b/lib/ansible/modules/network/ios/ios_config.py @@ -367,7 +367,7 @@ def main(): except NetworkError: exc = get_exception() module.disconnect() - module.fail_json(msg=str(exc)) + module.fail_json(msg=str(exc), stdout=exc.kwargs.get('stdout')) module.disconnect() module.exit_json(**result)