From 9f046cbbcc54778a610a476eb7b484ca9f3bab9f Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Wed, 20 Apr 2016 16:55:28 -0230
Subject: [PATCH] Clarify the help text for error_wait_time

The help text for error_wait_time is identical to stack_action_timeout
and does not indicate what it actually controls.

Change-Id: I1e7eeb3586e70b668534ed2fd6c8a45ec4c625fd
---
 heat/common/config.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/heat/common/config.py b/heat/common/config.py
index 9996bb7f0c..3a74f1be75 100644
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -154,8 +154,9 @@ engine_opts = [
                       ' update).')),
     cfg.IntOpt('error_wait_time',
                default=240,
-               help=_('Error wait time in seconds for stack action (ie. create'
-                      ' or update).')),
+               help=_('The amount of time in seconds after an error has'
+                      ' occurred that tasks may continue to run before'
+                      ' being cancelled.')),
     cfg.IntOpt('engine_life_check_timeout',
                default=2,
                help=_('RPC timeout for the engine liveness check that is used'