summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-10-11 08:54:15 -0400
committerTim Rozet <trozet@redhat.com>2017-10-11 17:25:43 +0000
commit6ddb7d379156ba03c9c4bdcb01679d6727cb4dd6 (patch)
tree25961749be067e1b5e0e0c882ea84738ed6c64fd
parent551dac3e8cf9c1fdd050ccaf4e8d79d946586d52 (diff)
Increase ssh timeout and add retry for Ansible
Several users have experienced random disconnections from the undercloud during deployment. This should help to stop deployments from aborting. Change-Id: Idb7619d493b329944f21ea6641f6826a8fcc3907 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 0fc3c2190ad304052d0ec210c94ab3f09e95b71d)
-rw-r--r--apex/common/utils.py3
-rw-r--r--lib/ansible/playbooks/deploy_dependencies.yml6
2 files changed, 8 insertions, 1 deletions
diff --git a/apex/common/utils.py b/apex/common/utils.py
index b1837b9..f418d42 100644
--- a/apex/common/utils.py
+++ b/apex/common/utils.py
@@ -76,7 +76,8 @@ def run_ansible(ansible_vars, playbook, host='localhost', user='root',
else:
conn_type = 'smart'
ansible_command = ['ansible-playbook', '--become', '-i', inv_host,
- '-u', user, '-c', conn_type, playbook, '-vv']
+ '-u', user, '-c', conn_type, '-T', '30',
+ playbook, '-vv']
if dry_run:
ansible_command.append('--check')
diff --git a/lib/ansible/playbooks/deploy_dependencies.yml b/lib/ansible/playbooks/deploy_dependencies.yml
index 8a57521..d274967 100644
--- a/lib/ansible/playbooks/deploy_dependencies.yml
+++ b/lib/ansible/playbooks/deploy_dependencies.yml
@@ -78,3 +78,9 @@
regexp: "tostring"
path: /usr/lib/python3.4/site-packages/virtualbmc/vbmc.py
when: vbmc_py.stat.exists == True
+ - name: Add ssh retry to Ansible config
+ ini_file:
+ path: /etc/ansible/ansible.cfg
+ section: ssh_connection
+ option: retries
+ value: 5