Check errors better in resolve_attributes()

Add a little more debug.

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

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index ce23e007b8a837b70eb47ccda0e33ab9878f01b9..84497d0a3746d7ec98569463f872adbbb9982618 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -303,7 +303,12 @@ class Stack(object):
                 elif i == 'Fn::GetAtt':
                     resource_name = s[i][0]
                     key_name = s[i][1]
-                    return self.resources[resource_name].FnGetAtt(key_name)
+                    res = self.resources.get(resource_name)
+                    rc = None
+                    if res:
+                        rc = res.FnGetAtt(key_name)
+                        #print 'found attr:%s.%s=%s' % (res.name, key_name, rc)
+                    return rc
                 else:
                     s[i] = self.resolve_attributes(s[i])
         elif isinstance(s, list):

diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index b44bd8641cc75af86d30f00cb62a7bb7298912ba..430d27c3d988d041d02e1e2f2ac4346d8b865768 100644 (file)
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -447,6 +447,7 @@ class Instance(Resource):
 
         # TODO(asalkeld) PrivateDnsName, PublicDnsName & PrivateIp
 
+        print '%s.GetAtt(%s) == %s' % (self.name, key, res)
         return unicode(res)
 
     def create(self):