openstack/heat
Code Issues Proposed changes

Merge changes I475ac4f7,I212cffac

Browse Source 
* changes:
  Add missing "properties_schema" to WaitConditionHandle
  Fix jeos_path when not intalled as an egg
This commit is contained in:
Jenkins 2012-05-29 21:37:22 +00:00 committed by Gerrit Code Review
commit 29aea9c552
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/heat
View File

@ -23,6 +23,7 @@ API server.
import gettext
import optparse
import os
import os.path
import sys
import time
import json
@ -34,15 +35,19 @@ from urlparse import urlparse
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
os.pardir,
os.pardir))
jeos_path = ''
cfntools_path = ''
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")
cfntools_path = '%s/heat/%s/' % (possible_topdir, "cfntools")
jeos_path = os.path.join(possible_topdir, 'jeos')
cfntools_path = os.path.join(possible_topdir, 'cfntools')
else:
for p in sys.path:
if 'heat' in p:
jeos_path = '%s/heat/%s/' % (p, "jeos")
cfntools_path = '%s/heat/%s/' % (p, "cfntools")
jeos_path = os.path.join(p, 'heat', 'jeos')
cfntools_path = os.path.join(p, 'heat', 'cfntools')
if os.access(jeos_path, os.R_OK):
break
gettext.install('heat', unicode=1)

4
heat/utils.py
View File

@ -15,6 +15,7 @@
import functools
import os
import os.path
import sys
import base64
from lxml import etree
@ -132,7 +133,8 @@ def jeos_create(options, arguments, jeos_path, cfntools_path):
logging.error('*** %s does not exist.' % (iso))
sys.exit(1)
tdl_path = '%s%s-%s-%s-jeos.tdl' % (jeos_path, distro, arch, instance_type)
tdl_file = '%s-%s-%s-jeos.tdl' % (distro, arch, instance_type)
tdl_path = os.path.join(jeos_path, tdl_file)
if options.debug:
print "Using tdl: %s" % tdl_path