From: Steven Dake <sdake@redhat.com>
Date: Wed, 4 Apr 2012 16:17:25 +0000 (-0700)
Subject: Use some evil to get the jeos tdl path
X-Git-Tag: 2014.1~2090
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ec9c7009fa184e609cbc0d5c4ae937ce5220afc2;p=openstack-build%2Fheat-build.git

Use some evil to get the jeos tdl path

Resolves issue #46
heat:251 tdl_path uses get_python_lib() which doesn't work with eggs

Signed-off-by: Steven Dake <sdake@redhat.com>
---

diff --git a/bin/heat b/bin/heat
index 4b186982..7bda4495 100755
--- a/bin/heat
+++ b/bin/heat
@@ -25,6 +25,9 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
                                    os.pardir))
 if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
     sys.path.insert(0, possible_topdir)
+    jeos_path = '%s/heat/%s/' % (possible_topdir, "jeos")
+else:
+    jeos_path = '%s/heat/%s/' % (sys.path[1], "jeos")
 
 gettext.install('heat', unicode=1)
 
@@ -212,6 +215,8 @@ def stack_list(options, arguments):
 def jeos_create(options, arguments):
     '''
     '''
+    global jeos_path
+
     # if not running as root, return EPERM to command line
     if os.geteuid() != 0:
         print "jeos_create must be run as root"
@@ -258,7 +263,7 @@ def jeos_create(options, arguments):
             print '*** %s does not exist.' % (iso)
             sys.exit(1)
 
-    tdl_path = '%s/heat/jeos/%s-%s-%s-jeos.tdl' % (get_python_lib(), distro, arch, instance_type)
+    tdl_path = '%s%s-%s-%s-jeos.tdl' % (jeos_path, distro, arch, instance_type)
     dsk_filename = '/var/lib/libvirt/images/%s-%s-%s-jeos.dsk' % (distro, arch, instance_type)
     qcow2_filename = '/var/lib/libvirt/images/%s-%s-%s-jeos.qcow2' % (distro, arch, instance_type)
     image_name = '%s-%s-%s' % (distro, arch, instance_type)