diff --git a/ansible.cfg b/ansible.cfg
index aecb198a0..20534b1f2 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,6 +1,7 @@
 [ssh_connection]
 pipelining=True
-#ssh_args = -F ./ssh-bastion.conf -o ControlMaster=auto -o ControlPersist=30m
+ssh_args = -o ControlMaster=auto -o ControlPersist=30m -o ConnectionAttempts=100
+#ssh_args = -F ./ssh-bastion.conf -o ControlMaster=auto -o ControlPersist=30m -o ConnectionAttempts=100
 #control_path = ~/.ssh/ansible-%%r@%%h:%%p
 [defaults]
 host_key_checking=False
diff --git a/requirements.txt b/requirements.txt
index 31181e7ac..889f36ef5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 pbr>=1.6
-ansible>=2.3.0
+ansible>=2.3.2
 netaddr
 jinja2>=2.9.6
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
index bf198f62e..a7d2e0183 100644
--- a/tests/ansible.cfg
+++ b/tests/ansible.cfg
@@ -1,5 +1,6 @@
 [ssh_connection]
 pipelining=True
+ssh_args = -o ControlMaster=auto -o ControlPersist=30m -o ConnectionAttempts=100
 [defaults]
 forks = 20
 host_key_checking=False