Enable ssh opts by in config, set 100 connection retries (#1662)

Also update to ansible 2.3.2
2017-09-15 10:19:36 +01:00 · 2017-09-15 10:19:36 +01:00 · 8d766a2ca9
parent f2ae16e71d
commit 8d766a2ca9
3 changed files with 4 additions and 2 deletions
--- 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
--- 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
--- 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