ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

fixes minor issues with shell (#21039)

Browse source 
* adds sendonly to command dict
* fixes setting timeout param
This commit is contained in:
Peter Sprygada 2017-02-04 09:40:40 -05:00 • committed by GitHub
parent 3eb40d1272
commit 39426a2207
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/module_utils/shell.py
View file

@ -73,6 +73,7 @@ class Shell(object):
allow_agent=False, key_policy="loose"): allow_agent=False, key_policy="loose"):
self.ssh = paramiko.SSHClient() self.ssh = paramiko.SSHClient()
if key_policy != "ignore": if key_policy != "ignore":
self.ssh.load_system_host_keys() self.ssh.load_system_host_keys()
try: try:
@ -90,14 +91,12 @@ class Shell(object):
if not look_for_keys: if not look_for_keys:
look_for_keys = password is None look_for_keys = password is None
try: try:
self.ssh.connect( self.ssh.connect(
host, port=port, username=username, password=password, host, port=port, username=username, password=password,
timeout=self._timeout, look_for_keys=look_for_keys, pkey=pkey, timeout=self._timeout, look_for_keys=look_for_keys, pkey=pkey,
key_filename=key_filename, allow_agent=allow_agent, key_filename=key_filename, allow_agent=allow_agent,
) )
self.shell = self.ssh.invoke_shell() self.shell = self.ssh.invoke_shell()
self.shell.settimeout(self._timeout) self.shell.settimeout(self._timeout)
except socket.gaierror: except socket.gaierror:
@ -160,7 +159,7 @@ class Shell(object):
self.shell.sendall(cmd) self.shell.sendall(cmd)
if self._timeout == 0: if obj.get('sendonly'):
return return
signal.alarm(self._timeout) signal.alarm(self._timeout)
@ -223,7 +222,8 @@ class CliBase(object):
username = params['username'] username = params['username']
password = params.get('password') password = params.get('password')
key_file = params.get('ssh_keyfile') key_file = params.get('ssh_keyfile')
timeout = params['timeout'] or 10
timeout = params.get('timeout') or 10
try: try:
self.shell = Shell( self.shell = Shell(
@ -259,7 +259,8 @@ class CliBase(object):
transform = ComplexDict(dict( transform = ComplexDict(dict(
command=dict(key=True), command=dict(key=True),
prompt=dict(), prompt=dict(),
response=dict() response=dict(),
sendonly=dict(default=False)
)) ))
return transform(obj) return transform(obj)