diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-23 17:24:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-23 17:24:16 +0000 |
| commit | b8ae0ae53aff0a7315e1517105a155e5f6bad573 (patch) | |
| tree | 6ecc33bc55c8f650fbd790a56e5d705d1d1ad84f /heat/engine/resource.py | |
| parent | 2fa8cc09d320d3bbed2f520c0216def60e43e490 (diff) | |
| parent | bbb7b2195d5bb34c23083cb4bb6820f00ce463fd (diff) | |
| download | heat-b8ae0ae53aff0a7315e1517105a155e5f6bad573.tar.gz | |
Merge "Don't look at convergence_engine conf option in Resource"
Diffstat (limited to 'heat/engine/resource.py')
| -rw-r--r-- | heat/engine/resource.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py index 70aff1dee..ba25f976a 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -1253,7 +1253,7 @@ class Resource(object): try: if (self.stack.action == 'ROLLBACK' and self.stack.status == 'IN_PROGRESS' and - not cfg.CONF.convergence_engine): + not self.stack.convergence): # handle case, when it's rollback and we should restore # old resource self.restore_prev_rsrc() @@ -1319,7 +1319,7 @@ class Resource(object): prev_resource): return - if not cfg.CONF.convergence_engine: + if not self.stack.convergence: if (self.action, self.status) in ( (self.CREATE, self.IN_PROGRESS), (self.UPDATE, self.IN_PROGRESS), |