Default to using a ControlMaster connection

2012-06-19 21:58:24 +02:00 · 2012-06-19 21:58:24 +02:00 · c84e11e9d5
commit c84e11e9d5
parent c8f416a2c2
1 changed files with 4 additions and 0 deletions
--- a/lib/ansible/runner/connection/ssh.py
+++ b/lib/ansible/runner/connection/ssh.py
@ -48,6 +48,10 @@ class SSHConnection(object):
        extra_args = os.getenv("ANSIBLE_SSH_ARGS", None)
        if extra_args is not None:
            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)

        return self