summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Sprygada <privateip@users.noreply.github.com>2017-02-16 20:26:29 -0500
committerGitHub <noreply@github.com>2017-02-16 20:26:29 -0500
commita01288859da1014d622979b270db98c3ab8249cd (patch)
treeb92a0d6bfe26cd788fd306fe918eebb2f217d916
parenteeaec56ed5bebb3366cc7aa80f63c3bf75436e8a (diff)
downloadansible-a01288859da1014d622979b270db98c3ab8249cd.tar.gz
check ios cli context and exits config mode if there (#21544)
-rw-r--r--lib/ansible/plugins/action/ios.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/ansible/plugins/action/ios.py b/lib/ansible/plugins/action/ios.py
index 13daf0fada..d1257c35ef 100644
--- a/lib/ansible/plugins/action/ios.py
+++ b/lib/ansible/plugins/action/ios.py
@@ -31,13 +31,19 @@ from ansible.module_utils.ios import ios_argument_spec
from ansible.module_utils.basic import AnsibleFallbackNotFound
from ansible.module_utils._text import to_bytes
+try:
+ from __main__ import display
+except ImportError:
+ from ansible.utils.display import Display
+ display = Display()
+
class ActionModule(_ActionModule):
def run(self, tmp=None, task_vars=None):
if self._play_context.connection != 'local':
return dict(
- fail=True,
+ failed=True,
msg='invalid connection specified, expected connection=local, '
'got %s' % self._play_context.connection
)
@@ -70,9 +76,9 @@ class ActionModule(_ActionModule):
results = super(ActionModule, self).run(tmp, task_vars)
# need to make sure to leave config mode if the module didn't clean up
- rc, out, err = connection.exec_command('EXEC: prompt()')
+ rc, out, err = connection.exec_command('prompt()')
if str(out).strip().endswith(')#'):
- connection.exec_command('EXEC: exit')
+ connection.exec_command('exit')
return results