summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-29 16:01:19 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-29 16:01:19 -0500
commit20537c6b1bf3d6908edf4d5c93324ced8c53f91f (patch)
tree8936f5f2e6fa8850fc1f9e06d3699db3240df101
parent7345fcf2a00e3011599b2b04a42b99ae707e7484 (diff)
parent87ad9f9c9c3b60d176e0633ab0f1d9a126ae83c3 (diff)
downloadopenshift-20537c6b1bf3d6908edf4d5c93324ced8c53f91f.tar.gz
openshift-20537c6b1bf3d6908edf4d5c93324ced8c53f91f.tar.bz2
openshift-20537c6b1bf3d6908edf4d5c93324ced8c53f91f.tar.xz
openshift-20537c6b1bf3d6908edf4d5c93324ced8c53f91f.zip
Merge pull request #1133 from lhuard1A/increase_openstack_timeout
Increase OpenStack stack creation/deletion timeout
-rw-r--r--playbooks/openstack/openshift-cluster/launch.yml3
-rw-r--r--playbooks/openstack/openshift-cluster/terminate.yml2
2 files changed, 3 insertions, 2 deletions
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"'