Skip to content

A
ansible
Commit 7dd0858c by Brian Coca
Options

Merge pull request #10770 from mscherer/fix_ssh_connection_v2 

Fix C.ANSIBLE_SSH_CONTROL_PATH string interpolation
parents 8ffe8956 cd25e0fb
Showing with 2 additions and 2 deletions
v2/ansible/plugins/connections/ssh.py
...@@ -74,7 +74,7 @@ class Connection(ConnectionBase): ...@@ -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): ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment