summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2013-08-20 21:37:11 +0200
committerJames Cammarata <jimi@sngx.net>2013-08-21 18:40:46 +0200
commite09ce0a3a7b61e29a194b382ff01ef8e4cd67f5a (patch)
tree5bda12f1a3bdb8d56701ec7566f4619b94098a8d /examples
parentPlace retry file in the user's home dir instead of /var/lib/tmp (diff)
downloadansible-e09ce0a3a7b61e29a194b382ff01ef8e4cd67f5a.tar.xz
ansible-e09ce0a3a7b61e29a194b382ff01ef8e4cd67f5a.zip
Commenting out default ssh arguments line in ansible.cfg
Also removing the ControlPath option, as it will now be auto-generated if the ControlPersist option is set in the arguments.
Diffstat (limited to 'examples')
-rw-r--r--examples/ansible.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index acedfb9cda..44295200e4 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -106,7 +106,7 @@ filter_plugins = /usr/share/ansible_plugins/filter_plugins
# ssh arguments to use
# Leaving off ControlPersist will result in poor performance, so use
# paramiko on older platforms rather than removing it
-ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r
+#ssh_args = -o ControlMaster=auto -o ControlPersist=60s
# if True, make ansible use scp if the connection type is ssh
# (default is sftp)