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

Merge branch 'ssh_config_user_overrides' of git://github.com/bcoca/ansible into devel

Browse source
This commit is contained in:
Michael DeHaan 2013-04-05 13:09:38 -04:00
commit f37da4fdd7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import pipes
import random import random
import select import select
import fcntl import fcntl
import pwd
import ansible.constants as C import ansible.constants as C
from ansible.callbacks import vvv from ansible.callbacks import vvv
from ansible import errors from ansible import errors
@ -62,7 +63,8 @@ class Connection(object):
else: else:
self.common_args += ["-o", "KbdInteractiveAuthentication=no", self.common_args += ["-o", "KbdInteractiveAuthentication=no",
"-o", "PasswordAuthentication=no"] "-o", "PasswordAuthentication=no"]
self.common_args += ["-o", "User="+self.user] 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