openstack/heat
Code Issues Proposed changes

Use some evil to get the jeos tdl path

Browse Source 
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>
This commit is contained in:
Steven Dake 2012-04-04 09:17:25 -07:00
parent ebdf76e1e8
commit ec9c7009fa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/heat
View File

@ -25,6 +25,9 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
os.pardir)) os.pardir))
if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')): if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
sys.path.insert(0, possible_topdir) 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) gettext.install('heat', unicode=1)
@ -212,6 +215,8 @@ def stack_list(options, arguments):
def jeos_create(options, arguments): def jeos_create(options, arguments):
''' '''
''' '''
global jeos_path
# if not running as root, return EPERM to command line # if not running as root, return EPERM to command line
if os.geteuid() != 0: if os.geteuid() != 0:
print "jeos_create must be run as root" print "jeos_create must be run as root"
@ -258,7 +263,7 @@ def jeos_create(options, arguments):
print '*** %s does not exist.' % (iso) print '*** %s does not exist.' % (iso)
sys.exit(1) 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) 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) qcow2_filename = '/var/lib/libvirt/images/%s-%s-%s-jeos.qcow2' % (distro, arch, instance_type)
image_name = '%s-%s-%s' % (distro, arch, instance_type) image_name = '%s-%s-%s' % (distro, arch, instance_type)