openstack
/
heat
Code Issues Proposed changes

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

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
Angus Salkeld 2012-05-14 21:14:55 +10:00
parent 845a670f7d
commit 3c84d66de9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
heat/engine/instance.py
View File

@ -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,