From 87ad9f9c9c3b60d176e0633ab0f1d9a126ae83c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= <lhuard@amadeus.com>
Date: Thu, 7 Jan 2016 18:10:41 +0100
Subject: Increase OpenStack stack creation/deletion timeout

---
 playbooks/openstack/openshift-cluster/launch.yml    | 3 ++-
 playbooks/openstack/openshift-cluster/terminate.yml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'playbooks/openstack')

diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml
index fdcb77acc..76cc64a73 100644
--- a/playbooks/openstack/openshift-cluster/launch.yml
+++ b/playbooks/openstack/openshift-cluster/launch.yml
@@ -29,6 +29,7 @@
 
   - name: Create or Update OpenStack Stack
     command: 'heat {{ heat_stack_action }} -f {{ openstack_infra_heat_stack }}
+             --timeout 3 --enable-rollback
              -P cluster_env={{ cluster_env }}
              -P cluster_id={{ cluster_id }}
              -P cidr={{ openstack_network_cidr }}
@@ -56,7 +57,7 @@
     register: stack_show_status_result
     until: stack_show_status_result.stdout not in ['CREATE_IN_PROGRESS', 'UPDATE_IN_PROGRESS']
     retries: 30
-    delay: 1
+    delay: 5
     failed_when: stack_show_status_result.stdout not in ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
 
   - name: Read OpenStack Stack outputs
diff --git a/playbooks/openstack/openshift-cluster/terminate.yml b/playbooks/openstack/openshift-cluster/terminate.yml
index d4ab51fa7..7a86b78c5 100644
--- a/playbooks/openstack/openshift-cluster/terminate.yml
+++ b/playbooks/openstack/openshift-cluster/terminate.yml
@@ -43,6 +43,6 @@
     register: stack_show_result
     until: stack_show_result.stdout != 'DELETE_IN_PROGRESS'
     retries: 60
-    delay: 1
+    delay: 5
     failed_when: '"Stack not found" not in stack_show_result.stderr and
                    stack_show_result.stdout != "DELETE_COMPLETE"'
-- 
cgit v1.2.3