summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorZhenguo Niu <Niu.ZGlinux@gmail.com>2014-10-24 13:58:21 +0800
committerZhenguo Niu <Niu.ZGlinux@gmail.com>2014-11-05 09:27:15 +0800
commit68a3cf78c4b0f60f12875c57215dad2f62b01635 (patch)
treeb28c60e214a3954534722cd782524bd16c87a891 /etc
parentc1b3eb22f7ab6ea60b095f88982247dd249139bf (diff)
downloadheat-68a3cf78c4b0f60f12875c57215dad2f62b01635.tar.gz
ERROR_WAIT_TIME should be a config option
As discussed at https://review.openstack.org/#/c/112941/ replace the hard-coded timeout value with a config option. Change-Id: I49ddf254dfe6460626d90cc75f89e798227dfff6 Closes-Bug: #1385014
Diffstat (limited to 'etc')
-rw-r--r--etc/heat/heat.conf.sample4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample
index 4dbdf95c2..5c216f610 100644
--- a/etc/heat/heat.conf.sample
+++ b/etc/heat/heat.conf.sample
@@ -67,6 +67,10 @@
# (integer value)
#stack_action_timeout=3600
+# Error wait time in seconds for stack action (ie. create or
+# update). (integer value)
+#error_wait_time=240
+
# RPC timeout for the engine liveness check that is used for
# stack locking. (integer value)
#engine_life_check_timeout=2