openstack
/
solum
Code Issues Proposed changes

Merge "Convert "auto" to "cedarish" in the worker"

This commit is contained in:
Jenkins 2014-05-01 05:51:01 +00:00 committed by Gerrit Code Review
parent cca129aadf e6eb7e80e8
commit e69754c15c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solum/worker/handlers/shell.py
View File

@ -69,9 +69,11 @@ class Handler(object):
'dib': 'diskimage-builder',
'docker': 'docker',
'qcow2': 'vm-slug'}
if base_image_id == 'auto' and image_format == 'qcow2':
base_image_id = 'cedarish'
build_app = os.path.join(proj_dir, 'contrib',
pathm.get(source_format, 'heroku'),
pathm.get(image_format, 'qcow2'),
pathm.get(source_format, 'lp-cedarish'),
pathm.get(image_format, 'vm-slug'),
'build-app')
build_cmd = [build_app, source_uri, name, ctxt.tenant, base_image_id]
solum.TLS.trace.support_info(build_cmd=' '.join(build_cmd),