openstack
/
heat
Code Issues Proposed changes

Fix userdata mime creation 

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
Angus Salkeld 2012-04-26 22:51:38 +10:00
parent 7151e57984
commit e5553b53d5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources.py
View File

@ -544,7 +544,8 @@ class Instance(Resource):
msg = MIMEText(userdata, _subtype='x-shellscript')
msg.add_header('Content-Disposition', 'attachment', filename='startup')
return mime_blob.attach(msg)
mime_blob.attach(msg)
return mime_blob.as_string()
def create(self):
def _null_callback(p, n, out):
@ -599,7 +600,7 @@ class Instance(Resource):
if o.name == flavor:
flavor_id = o.id
server_userdata = self._build_userdata(userdata)
server_userdata = self._build_userdata(userdata)
server = self.nova().servers.create(name=self.name, image=image_id,
flavor=flavor_id,
key_name=key_name,