mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #217 from jhoekx/connection-fixes
Expand user in ssh identity file
This commit is contained in:
commit
02abb5a83b
1 changed files with 26 additions and 26 deletions
|
@ -76,30 +76,30 @@ class ParamikoConnection(object):
|
|||
self.port = self.runner.remote_port
|
||||
|
||||
def _get_conn(self):
|
||||
credentials = {}
|
||||
user = self.runner.remote_user
|
||||
keypair = None
|
||||
credentials = {}
|
||||
user = self.runner.remote_user
|
||||
keypair = None
|
||||
|
||||
# Read file ~/.ssh/config, get data hostname, keyfile, port, etc
|
||||
# This overrides the ansible defined username,hostname and port
|
||||
try:
|
||||
# Read file ~/.ssh/config, get data hostname, keyfile, port, etc
|
||||
# This overrides the ansible defined username,hostname and port
|
||||
try:
|
||||
ssh_config = paramiko.SSHConfig()
|
||||
config_file = ('~/.ssh/config')
|
||||
if os.path.exists(os.path.expanduser(config_file)):
|
||||
ssh_config.parse(open(os.path.expanduser(config_file)))
|
||||
credentials = ssh_config.lookup(self.host)
|
||||
config_file = ('~/.ssh/config')
|
||||
if os.path.exists(os.path.expanduser(config_file)):
|
||||
ssh_config.parse(open(os.path.expanduser(config_file)))
|
||||
credentials = ssh_config.lookup(self.host)
|
||||
|
||||
except IOError,e:
|
||||
raise errors.AnsibleConnectionFailed(str(e))
|
||||
|
||||
if 'hostname' in credentials:
|
||||
if 'hostname' in credentials:
|
||||
self.host = credentials['hostname']
|
||||
if 'port' in credentials:
|
||||
if 'port' in credentials:
|
||||
self.port = int(credentials['port'])
|
||||
if 'user' in credentials:
|
||||
if 'user' in credentials:
|
||||
user = credentials['user']
|
||||
if 'identityfile' in credentials:
|
||||
keypair = credentials['identityfile']
|
||||
if 'identityfile' in credentials:
|
||||
keypair = os.path.expanduser(credentials['identityfile'])
|
||||
|
||||
ssh = paramiko.SSHClient()
|
||||
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
|
||||
|
@ -111,7 +111,7 @@ class ParamikoConnection(object):
|
|||
allow_agent=True,
|
||||
look_for_keys=True,
|
||||
password=self.runner.remote_pass,
|
||||
key_filename=keypair,
|
||||
key_filename=keypair,
|
||||
timeout=self.runner.timeout,
|
||||
port=self.port
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue