summaryrefslogtreecommitdiff
path: root/lib/ansible/plugins/connection/ssh.py
diff options
context:
space:
mode:
authorAndrea Tartaglia <me@andreatartaglia.com>2016-11-03 22:19:59 +0000
committerToshio Kuratomi <a.badger@gmail.com>2016-11-03 15:19:59 -0700
commitb18263cf3668e2330825c4ae42161e619f81e2e4 (patch)
treea5b1bc4adf01f4e736d3c3ff7d4ff83e87e04051 /lib/ansible/plugins/connection/ssh.py
parent9547d6b422c8cc6c9a4f0fe6188ad2e4f218b475 (diff)
downloadansible-b18263cf3668e2330825c4ae42161e619f81e2e4.tar.gz
ANSIBLE_SSH_CONTROL_PATH_DIR option added (#18342)
* ANSIBLE_SSH_CONTROL_PATH_DIR option added This removes the hardcoded value ( $HOME/.ansible/cp ) from ssh.py. User is able to change the ControlPath directory ( the one that replaces %(directory)s ). Fixes #18325 * Added config option in ansible.cfg
Diffstat (limited to 'lib/ansible/plugins/connection/ssh.py')
-rw-r--r--lib/ansible/plugins/connection/ssh.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/plugins/connection/ssh.py b/lib/ansible/plugins/connection/ssh.py
index 0c18b983a5..cf6df55439 100644
--- a/lib/ansible/plugins/connection/ssh.py
+++ b/lib/ansible/plugins/connection/ssh.py
@@ -228,7 +228,7 @@ class Connection(ConnectionBase):
self._persistent = True
if not controlpath:
- cpdir = unfrackpath(u'$HOME/.ansible/cp')
+ cpdir = unfrackpath(C.ANSIBLE_SSH_CONTROL_PATH_DIR)
b_cpdir = to_bytes(cpdir, errors='surrogate_or_strict')
# The directory must exist and be writable.