diff options
| author | Steve Baker <sbaker@redhat.com> | 2015-12-04 13:05:27 +1300 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2015-12-04 13:05:27 +1300 |
| commit | f64cefa628fc061953c38a4c8f0e61e40eab6d6e (patch) | |
| tree | 83e1f445db5bd3bc607f83b73824813e9f37633c | |
| parent | f1081b678ea8f93630a3f628197814a80b01dfc6 (diff) | |
| download | heat-f64cefa628fc061953c38a4c8f0e61e40eab6d6e.tar.gz | |
reset_stack_status thread_lock needs stack_id
The initial backport of I1739ccbdf75af35aac5be16b99200975df58b8e2 failed
to take into account the different method arguments required by the
thread_lock method, so reset_stack_status doesn't work without this
change.
Change-Id: Id11cf0c7d651433cb8331a20552435fbbf822f92
Closes-Bug: #1514615
| -rw-r--r-- | heat/engine/service.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py index 50e769279..070244e07 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -1612,7 +1612,7 @@ class EngineService(service.Service): lock = stack_lock.StackLock(cnxt, stk, self.engine_id) engine_id = lock.get_engine_id() try: - with lock.thread_lock(retry=False): + with lock.thread_lock(stack_id, retry=False): # refetch stack and confirm it is still IN_PROGRESS s = stack_object.Stack.get_by_id( |