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

Merge pull request #10770 from mscherer/fix_ssh_connection_v2

Browse source 
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
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
v2/ansible/plugins/connections/ssh.py
View file

@ -74,7 +74,7 @@ class Connection(ConnectionBase):
self._common_args += (
"-o", "ControlMaster=auto",
"-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
@ -87,7 +87,7 @@ class Connection(ConnectionBase):
if cp_in_use and not cp_path_set:
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: