Make the change for all ansible runs.

Instead of making the change just for ansible-provision.sh make the
change for all ansible runs.  Most of them don't currently have this
problem right now but I think it makes sense to make them all consistent
and not have to worry about this problem in the future.

docker/plays/ansible.cfg

@@ -4,3 +4,5 @@ jinja2_extensions=jinja2.ext.do
 roles_path=../plays:../../playbooks/roles
 library=../../playbooks/library
 
+[ssh_connection]
+ssh_args='-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30'

playbooks/ansible.cfg

@@ -7,4 +7,7 @@
 jinja2_extensions=jinja2.ext.do
 host_key_checking = False
 roles_path=../../ansible-roles/roles:../../ansible-private/roles:../../ansible-roles/
-ansible_managed=This file is created and updated by ansible, edit at your peril
\ No newline at end of file
+ansible_managed=This file is created and updated by ansible, edit at your peril
+
+[ssh_connection]
+ssh_args='-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30'

playbooks/continuous_delivery/ansible.cfg

@@ -8,9 +8,7 @@ jinja2_extensions=jinja2.ext.do
 host_key_checking=False
 roles_path=../../../ansible-roles/roles:../../../ansible-private/roles:../../../ansible-roles/
 library=../library/
-
-# ControlPersist keeps the socket ssh creates open to the target. Increasing this timeout decreases
-# some of the ssh overhead with all the ssh connections ansible makes by allowing it to just reuse the
-# socket for each ssh session. This should improve performance since we are now running ansible remotely.
-ssh_args = -o ControlMaster=auto -o ControlPersist=30m -o StrictHostKeyChecking=no
 ansible_managed=This file is created and updated by ansible, edit at your peril
+
+[ssh_connection]
+ssh_args='-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30'

playbooks/edx-east/ansible.cfg

@@ -8,3 +8,6 @@ jinja2_extensions=jinja2.ext.do
 host_key_checking=False
 roles_path=../../../ansible-roles/roles:../../../ansible-private/roles:../../../ansible-roles/
 ansible_managed=This file is created and updated by ansible, edit at your peril
+
+[ssh_connection]
+ssh_args='-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30'

playbooks/vagrant/ansible.cfg

@@ -6,3 +6,6 @@ library=../library
 roles_path=../roles
 callback_plugins=../callback_plugins
 ansible_managed=This file is created and updated by ansible, edit at your peril
+
+[ssh_connection]
+ssh_args='-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30'

util/jenkins/ansible-provision.sh

@@ -24,7 +24,6 @@ env | grep -v AWS | grep -v ARN
 
 export PYTHONUNBUFFERED=1
 export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
-export ANSIBLE_SSH_ARGS='-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30'
 
 # docker on OS-X includes your Mac's home directory in the socket path
 # that SSH/Ansible uses for the control socket, pushing you over

vagrant/base/cluster/ansible.cfg

@@ -7,3 +7,6 @@
 jinja2_extensions=jinja2.ext.do
 host_key_checking = False
 roles_path=../../ansible-roles/roles:../../ansible-private/roles:../../ansible-roles/
+
+[ssh_connection]
+ssh_args='-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30'

vagrant/base/test_playbook/ansible.cfg

@@ -8,3 +8,6 @@ jinja2_extensions=jinja2.ext.do
 host_key_checking = False
 roles_path=../../ansible-roles/roles:../../ansible-private/roles:../../ansible-roles/
 ansible_managed=This file is created and updated by ansible, edit at your peril
+
+[ssh_connection]
+ssh_args='-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30'