diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-09 11:36:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-09 11:36:23 +0000 |
| commit | b0a72cba7ac143ae7b47daa69c2cf06af03ca9b7 (patch) | |
| tree | ff8b273ff4a5a4c85828419d42a180f09392e069 | |
| parent | fc79d56d9d4e643dda138f39a0fd9f983c96265b (diff) | |
| parent | cd5c0583d699d59459a98d0762343cc46854182e (diff) | |
| download | heat-b0a72cba7ac143ae7b47daa69c2cf06af03ca9b7.tar.gz | |
Merge "Don't change INIT_COMPLETE resources to CHECK_COMPLETE"
| -rw-r--r-- | heat/engine/resource.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py index ca3cfc1f1..644756114 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -1736,6 +1736,10 @@ class Resource(status.ResourceStatus): with self.frozen_properties(): return self._do_action(action) else: + if self.state == (self.INIT, self.COMPLETE): + # No need to store status; better to leave the resource in + # INIT_COMPLETE than imply that we've checked and it exists. + return reason = '%s not supported for %s' % (action, self.type()) self.state_set(action, self.COMPLETE, reason) |