From: Angus Salkeld <asalkeld@redhat.com>
Date: Wed, 20 Jun 2012 12:21:24 +0000 (+1000)
Subject: Use the resource.state_description
X-Git-Tag: 2014.1~1698
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b85bdc2d6c958a76ef0e274e1cf74ce1a4bb2e07;p=openstack-build%2Fheat-build.git

Use the resource.state_description

Change-Id: I114067f3bb91c6d38b3c4c69af842f4f3585810b
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
---

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 59276afe..7b8eb945 100644
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -600,4 +600,5 @@ def format_resource_attributes(stack, resource):
         'ResourceType': resource_type,
         'LastUpdatedTimestamp': last_updated_time.isoformat(),
         'ResourceStatus': resource.state,
+        'ResourceStatusReason': resource.state_description,
     }
diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index f21e709c..67cd13e5 100644
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -250,6 +250,7 @@ class Resource(object):
             try:
                 rs = db_api.resource_get(self.stack.context, self.id)
                 rs.update_and_save({'state': self.state,
+                                    'state_description': reason,
                                     'nova_instance': self.instance_id})
 
                 if rs.stack: