Do not read user's SSH config file because only reading it partially is confusing to everyone :)

This commit is contained in:
Michael DeHaan 2012-05-09 23:45:37 -04:00
parent bfe5f4d0ed
commit b7bb0ab225

View file

@ -76,27 +76,7 @@ class ParamikoConnection(object):
self.port = self.runner.remote_port
def _get_conn(self):
credentials = {}
user = self.runner.remote_user
keypair = None
# Read file ~/.ssh/config, get data hostname, keyfile, port, etc
# This will *NOT* overrides the ansible username and hostname " , getting the port and keyfile only.
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)
except IOError,e:
raise errors.AnsibleConnectionFailed(str(e))
if 'port' in credentials:
self.port = int(credentials['port'])
if 'identityfile' in credentials:
keypair = os.path.expanduser(credentials['identityfile'])
ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
@ -108,7 +88,7 @@ class ParamikoConnection(object):
allow_agent=True,
look_for_keys=True,
password=self.runner.remote_pass,
key_filename=keypair,
# key_filename=None, # TODO: allow this to be passed in
timeout=self.runner.timeout,
port=self.port
)