internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-05 02:03:09 +00:00
Code Issues Packages 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
parent 8ffe895638 cd25e0fba0
commit 7dd0858cb7
1 changed files with 2 additions and 2 deletions
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: