Merge pull request from mscherer/fix_ssh_connection_v2

Fix C.ANSIBLE_SSH_CONTROL_PATH string interpolation
This commit is contained in:
Brian Coca 2015-04-19 01:17:15 -04:00
commit 7dd0858cb7

View file

@ -74,7 +74,7 @@ class Connection(ConnectionBase):
self._common_args += ( self._common_args += (
"-o", "ControlMaster=auto", "-o", "ControlMaster=auto",
"-o", "ControlPersist=60s", "-o", "ControlPersist=60s",
"-o", "ControlPath=\"{0}\"".format(C.ANSIBLE_SSH_CONTROL_PATH.format(dict(directory=self._cp_dir))), "-o", "ControlPath=\"{0}\"".format(C.ANSIBLE_SSH_CONTROL_PATH % dict(directory=self._cp_dir)),
) )
cp_in_use = False cp_in_use = False
@ -87,7 +87,7 @@ class Connection(ConnectionBase):
if cp_in_use and not cp_path_set: if cp_in_use and not cp_path_set:
self._common_args += ("-o", "ControlPath=\"{0}\"".format( self._common_args += ("-o", "ControlPath=\"{0}\"".format(
C.ANSIBLE_SSH_CONTROL_PATH.format(dict(directory=self._cp_dir))) C.ANSIBLE_SSH_CONTROL_PATH % dict(directory=self._cp_dir))
) )
if not C.HOST_KEY_CHECKING: if not C.HOST_KEY_CHECKING: