diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-07 11:01:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-07 11:01:03 +0000 |
| commit | 4aa687ed79437d96dc65a0805fe8a3257156afbb (patch) | |
| tree | 43260129f5ddd46ddd5707985621e315f7aa0114 | |
| parent | 9a22d21226064bc702c7a5c1c39ee70e378df754 (diff) | |
| parent | f64cefa628fc061953c38a4c8f0e61e40eab6d6e (diff) | |
| download | heat-4aa687ed79437d96dc65a0805fe8a3257156afbb.tar.gz | |
Merge "reset_stack_status thread_lock needs stack_id" into stable/kilo
| -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( |