summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2014-06-08 01:37:12 +0000
committerKevin Fenzi <kevin@scrye.com>2014-06-08 01:37:12 +0000
commit7dcbcdd2d70c6704366952e437b870cfb671f7cd (patch)
treefdec669a6c8fddf0ad0efd528a9e5eecee1dbc53
parentd63fc93ab2c9671f1367fee71d6ead1d142fedec (diff)
Fix ssh args here too.
-rw-r--r--files/copr/provision/ansible.cfg2
-rw-r--r--roles/ansible-server/templates/ansible.cfg.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/files/copr/provision/ansible.cfg b/files/copr/provision/ansible.cfg
index c90accb24..6b8c6b8f5 100644
--- a/files/copr/provision/ansible.cfg
+++ b/files/copr/provision/ansible.cfg
@@ -88,6 +88,6 @@ record_host_keys=False
# will result in poor performance, so use transport=paramiko on older platforms rather than
# removing it
-ssh_args=-o PasswordAuthentication=no -o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r
+ssh_args=-o PasswordAuthentication=no -o ControlMaster=auto -o ControlPersist=60s
diff --git a/roles/ansible-server/templates/ansible.cfg.j2 b/roles/ansible-server/templates/ansible.cfg.j2
index a1fb0cd6e..00d6bdd71 100644
--- a/roles/ansible-server/templates/ansible.cfg.j2
+++ b/roles/ansible-server/templates/ansible.cfg.j2
@@ -88,4 +88,4 @@ host_key_checking=False
# will result in poor performance, so use transport=paramiko on older platforms rather than
# removing it
-ssh_args=-o PasswordAuthentication=no -o ControlMaster=auto -o ControlPath=/tmp/ansible-ssh-%h-%p-%r
+ssh_args=-o PasswordAuthentication=no -o ControlMaster=auto