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

removes the default kwarg in ios_argument_spec for timeout (#21552)

Browse source 
Uses the configured timeout setting instead of the arg_spec

fixes #21520
This commit is contained in:
Peter Sprygada 2017-02-17 07:12:12 -05:00 committed by Ricardo Carrillo Cruz
parent a5d34f2ac2
commit b0abbb5f8b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/ios.py
View file

@ -39,7 +39,7 @@ ios_argument_spec = {
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
'auth_pass': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS']), no_log=True),
'timeout': dict(type='int', default=10),
'timeout': dict(type='int'),
'provider': dict(type='dict'),
}

5
lib/ansible/plugins/action/ios.py
View file

@ -56,6 +56,7 @@ class ActionModule(_ActionModule):
pc.port = provider['port'] or self._play_context.port or 22
pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password
pc.timeout = provider['timeout'] or self._play_context.timeout
pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass']
@ -64,7 +65,9 @@ class ActionModule(_ActionModule):
socket_path = self._get_socket_path(pc)
if not os.path.exists(socket_path):
# start the connection if it isn't started
connection.exec_command('EXEC: show version')
rc, out, err = connection.exec_command('open_shell()')
if not rc == 0:
return {'failed': True, 'msg': 'unable to open shell', 'rc': rc}
task_vars['ansible_socket'] = socket_path