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

Revert "Explicitly set the user option for ssh connections"

Browse source 
This reverts commit 0f91add86f.

Fixes #8216
This commit is contained in:
James Cammarata 2014-07-21 10:32:43 -05:00
parent 571dbe09c3
commit 00e089e503
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/runner/connection_plugins/ssh.py
View file

@ -94,7 +94,8 @@ class Connection(object):
self.common_args += ["-o", "KbdInteractiveAuthentication=no", self.common_args += ["-o", "KbdInteractiveAuthentication=no",
"-o", "PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey", "-o", "PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey",
"-o", "PasswordAuthentication=no"] "-o", "PasswordAuthentication=no"]
self.common_args += ["-o", "User=" + (self.user or pwd.getpwuid(os.geteuid())[0])] if self.user != pwd.getpwuid(os.geteuid())[0]:
self.common_args += ["-o", "User="+self.user]
self.common_args += ["-o", "ConnectTimeout=%d" % self.runner.timeout] self.common_args += ["-o", "ConnectTimeout=%d" % self.runner.timeout]
return self return self