Check for the presence of Metadat before trying to include it the multipart

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

diff --git a/heat/engine/instance.py b/heat/engine/instance.py
index 2199744af7245399ecb7c373f569045214b21cba..96eb54ea05a95f8b5a65fecbef51dd2f8eda6fcb 100644 (file)
--- a/heat/engine/instance.py
+++ b/heat/engine/instance.py
@@ -102,11 +102,12 @@ class Instance(Resource):
                            filename='part-handler.py')
             mime_blob.attach(msg)
 
-            msg = MIMEText(json.dumps(self.t['Metadata']),
-                           _subtype='x-cfninitdata')
-            msg.add_header('Content-Disposition', 'attachment',
-                           filename='cfn-init-data')
-            mime_blob.attach(msg)
+            if 'Metadata' in self.t:
+                msg = MIMEText(json.dumps(self.t['Metadata']),
+                               _subtype='x-cfninitdata')
+                msg.add_header('Content-Disposition', 'attachment',
+                               filename='cfn-init-data')
+                mime_blob.attach(msg)
 
             if self.stack.metadata_server:
                 msg = MIMEText(self.stack.metadata_server,