From 39f2aa0723b72668832f4c1eec3c31d18fb8cf74 Mon Sep 17 00:00:00 2001
From: rabi <ramishra@redhat.com>
Date: Mon, 5 Jun 2017 17:26:37 +0530
Subject: [PATCH] Load 'name' field for db resource

I405888f46451d2657aa28f610f8ca555215ff5cf changed to load only
a few fields when loading the resource from the db. We should
load 'name' field for it to be used when rasing ConcurrentTransaction
exception.

Change-Id: I699961b75c7c417d03e21b51a2464c39e737ca89
Related-Bug: #1583679
Related-Bug: #1680658
---
 heat/engine/resource.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index 1ebb924d31..2e40cea6ff 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -444,7 +444,7 @@ class Resource(status.ResourceStatus):
         refresh = merge_metadata is not None
         db_res = resource_objects.Resource.get_obj(
             self.stack.context, self.id, refresh=refresh,
-            fields=('rsrc_metadata', 'atomic_key', 'engine_id',
+            fields=('name', 'rsrc_metadata', 'atomic_key', 'engine_id',
                     'action', 'status'))
         if db_res.action == self.DELETE:
             self._db_res_is_deleted = True