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 59276afe75455a5f05c513037428265730a50bbc..7b8eb94599199aef6fb7b31df3587efdb40e0fd5 100644 (file)
--- 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 f21e709c7fd8485b03e3dfd2eeb478c6841a1eb1..67cd13e5cf1da0dfafe41972ff47d00293b28b15 100644 (file)
--- 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: