From ee56b0978e3fa4a3aea51f4257b769b9e48f139a Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Thu, 26 Apr 2012 22:51:38 +1000 Subject: [PATCH] Fix userdata mime creation Signed-off-by: Angus Salkeld --- heat/engine/resources.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/heat/engine/resources.py b/heat/engine/resources.py index 43866665..e0a8da7a 100644 --- a/heat/engine/resources.py +++ b/heat/engine/resources.py @@ -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, -- 2.45.2