From 7d166abe460dda339816554c8e0e677a746e79c6 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Tue, 27 Nov 2012 16:40:31 +0100 Subject: [PATCH] Use pkgutil to load cloudinit data Unlike reading from the filesystem, this will allow the data to be read even if the package is installed as a gzipped tarball. Change-Id: I1972f2b6a1b6cee12521480ed774468bb3444780 Signed-off-by: Zane Bitter --- heat/engine/resources/instance.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index b70da311..7ff0b0f2 100644 --- a/heat/engine/resources/instance.py +++ b/heat/engine/resources/instance.py @@ -19,9 +19,9 @@ import json from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from novaclient.exceptions import NotFound +import pkgutil from urlparse import urlparse -import heat from heat.engine import resource from heat.common import exception @@ -166,9 +166,7 @@ class Instance(resource.Resource): return msg def read_cloudinit_file(fn): - with open(os.path.join(heat.__path__[0], 'cloudinit', fn), - 'r') as fp: - return fp.read() + return pkgutil.get_data('heat', 'cloudinit/%s' % fn) attachments = [(read_cloudinit_file('config'), 'cloud-config'), (read_cloudinit_file('part-handler.py'), -- 2.45.2