mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #1105 from alopropoz/devel
Don't use ssh-agent if password is specified.
This commit is contained in:
commit
151085c745
1 changed files with 4 additions and 1 deletions
|
@ -58,8 +58,11 @@ class Connection(object):
|
|||
ssh = paramiko.SSHClient()
|
||||
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
|
||||
|
||||
allow_agent = True
|
||||
if self.runner.remote_pass is not None:
|
||||
allow_agent = False
|
||||
try:
|
||||
ssh.connect(self.host, username=user, allow_agent=True, look_for_keys=True,
|
||||
ssh.connect(self.host, username=user, allow_agent=allow_agent, look_for_keys=True,
|
||||
key_filename=self.runner.private_key_file, password=self.runner.remote_pass,
|
||||
timeout=self.runner.timeout, port=self.port)
|
||||
except Exception, e:
|
||||
|
|
Loading…
Reference in a new issue