diff options
| author | Ethan Lynn <xjunlin@cn.ibm.com> | 2016-08-24 17:56:29 +0800 |
|---|---|---|
| committer | Ethan Lynn <xuanlangjian@gmail.com> | 2016-08-26 07:09:27 +0000 |
| commit | 1e03e621ac040f5ce6d23d35e8096e9800f9045e (patch) | |
| tree | 91fc9bcabf798fe1c28ab37151e547614a9ab40e /heat/engine/resources/openstack/senlin | |
| parent | 73a1eed1bc27dec3682446acf53ab20ddfbce8a3 (diff) | |
| download | heat-1e03e621ac040f5ce6d23d35e8096e9800f9045e.tar.gz | |
Minor fix for senlin cluster update
Use check_action_status from senlin plugin to check status.
Change-Id: I143b7d1dfd3dbe1848a2af9c50224bd2934a8c37
Diffstat (limited to 'heat/engine/resources/openstack/senlin')
| -rw-r--r-- | heat/engine/resources/openstack/senlin/cluster.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/heat/engine/resources/openstack/senlin/cluster.py b/heat/engine/resources/openstack/senlin/cluster.py index 7567040ad..79265283d 100644 --- a/heat/engine/resources/openstack/senlin/cluster.py +++ b/heat/engine/resources/openstack/senlin/cluster.py @@ -59,12 +59,6 @@ class Cluster(resource.Resource): 'CREATING', 'DELETING', 'UPDATING' ) - _ACTION_STATUS = ( - ACTION_SUCCEEDED, ACTION_FAILED, - ) = ( - 'SUCCEEDED', 'FAILED', - ) - properties_schema = { PROFILE: properties.Schema( properties.Schema.STRING, @@ -231,14 +225,10 @@ class Cluster(resource.Resource): updater['action'] = action_id updater['start'] = True else: - action = self.client().get_action(updater['action']) - if action.status == self.ACTION_SUCCEEDED: + ret = self.client_plugin().check_action_status( + updater['action']) + if ret: del updaters[k] - elif action.status == self.ACTION_FAILED: - raise exception.ResourceInError( - status_reason=action.status_reason, - resource_status=self.FAILED, - ) return False def validate(self): |