summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-25 22:51:05 +0000
committerGerrit Code Review <review@openstack.org>2019-10-25 22:51:06 +0000
commitad1a8a306eefbad8d5432ddef078c1a249ff00df (patch)
treed91c1e7663ae75f6b8c31531e16c2240c3290d9a
parent9fd389d088cc49fdce4ebbfcba4d65baa1c6afa1 (diff)
parente32f0ad30a0a119f491429582ce8c8c47ba7e962 (diff)
downloadheat-ad1a8a306eefbad8d5432ddef078c1a249ff00df.tar.gz
Merge "Set stack.thread_group_mgr for cancel_update" into stable/pike
-rw-r--r--heat/engine/service.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py
index 615c52897..285777156 100644
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -1165,6 +1165,7 @@ class EngineService(service.ServiceBase):
LOG.info('Starting cancel of updating stack %s', db_stack.name)
if current_stack.convergence:
+ current_stack.thread_group_mgr = self.thread_group_mgr
if cancel_with_rollback:
func = current_stack.rollback
else: