|
|
|
@ -65,7 +65,7 @@ class Connection(object):
|
|
|
|
|
else:
|
|
|
|
|
self.common_args += ["-o", "ControlMaster=auto",
|
|
|
|
|
"-o", "ControlPersist=60s",
|
|
|
|
|
"-o", "ControlPath=%s" % (C.ANSIBLE_SSH_CONTROL_PATH % dict(directory=self.cp_dir))]
|
|
|
|
|
"-o", "ControlPath=\"%s\"" % (C.ANSIBLE_SSH_CONTROL_PATH % dict(directory=self.cp_dir))]
|
|
|
|
|
|
|
|
|
|
cp_in_use = False
|
|
|
|
|
cp_path_set = False
|
|
|
|
@ -76,7 +76,7 @@ class Connection(object):
|
|
|
|
|
cp_path_set = True
|
|
|
|
|
|
|
|
|
|
if cp_in_use and not cp_path_set:
|
|
|
|
|
self.common_args += ["-o", "ControlPath=%s" % (C.ANSIBLE_SSH_CONTROL_PATH % dict(directory=self.cp_dir))]
|
|
|
|
|
self.common_args += ["-o", "ControlPath=\"%s\"" % (C.ANSIBLE_SSH_CONTROL_PATH % dict(directory=self.cp_dir))]
|
|
|
|
|
|
|
|
|
|
if not C.HOST_KEY_CHECKING:
|
|
|
|
|
self.common_args += ["-o", "StrictHostKeyChecking=no"]
|
|
|
|
|