opendev/system-config
Code Issues Proposed changes

Merge "Fix minor non-important error in cache_devstack"

Browse Source
This commit is contained in:
Jenkins 2014-04-29 14:53:03 +00:00 committed by Gerrit Code Review
commit d4f0612718
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/files/nodepool/scripts/cache_devstack.py
View File

@ -52,7 +52,7 @@ def tokenize(fn, tokens, distribution, comment=None):
def _legacy_find_images(basedir): def _legacy_find_images(basedir):
"""Divine what images we should use based on parsing stackrc.""" """Divine what images we should use based on parsing stackrc."""
images = [] images = []
for line in open(os.path.join(DEVSTACK, 'stackrc')): for line in open(os.path.join(basedir, 'stackrc')):
line = line.strip() line = line.strip()
if line.startswith('IMAGE_URLS'): if line.startswith('IMAGE_URLS'):
if '#' in line: if '#' in line:
@ -78,7 +78,7 @@ def _legacy_find_images(basedir):
def _find_images(basedir): def _find_images(basedir):
images = [] images = []
try: try:
image_tool = os.path.join(DEVSTACK, 'tools', 'image_list.sh') image_tool = os.path.join(basedir, 'tools', 'image_list.sh')
if os.path.exists(image_tool): if os.path.exists(image_tool):
images = subprocess.check_output(image_tool).split('\n') images = subprocess.check_output(image_tool).split('\n')
except subprocess.CalledProcessError as ce: except subprocess.CalledProcessError as ce: