From: Angus Salkeld Date: Thu, 26 Apr 2012 12:51:38 +0000 (+1000) Subject: Fix userdata mime creation X-Git-Tag: 2014.1~1923^2~4 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e5553b53d5ef72a135bc12f23a00561c76d9e119;p=openstack-build%2Fheat-build.git Fix userdata mime creation Signed-off-by: Angus Salkeld --- 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,