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

Merge pull request #489 from dhozac/ssh-args-default

Browse source 
Default to using a ControlMaster connection
This commit is contained in:
Michael DeHaan 2012-06-19 13:01:09 -07:00
commit b067ea5a7f
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,10 @@ class SSHConnection(object):
extra_args = os.getenv("ANSIBLE_SSH_ARGS", None) extra_args = os.getenv("ANSIBLE_SSH_ARGS", None)
if extra_args is not None: if extra_args is not None:
self.common_args += shlex.split(extra_args) self.common_args += shlex.split(extra_args)
else:
self.common_args += ["-o", "ControlMaster=auto",
"-o", "ControlPersist=60s",
"-o", "ControlPath=/tmp/ansible-ssh-%h-%p-%r"]
self.userhost = "%s@%s" % (self.runner.remote_user, self.host) self.userhost = "%s@%s" % (self.runner.remote_user, self.host)
return self return self