openstack/kolla
Code Issues Proposed changes

Merge "Add error handler for unknown build type"

Browse Source
This commit is contained in:
Jenkins 2015-11-22 18:28:52 +00:00 committed by Gerrit Code Review
commit 4d69166e57
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kolla/cmd/build.py
View File

@ -47,6 +47,10 @@ class KollaDirNotFoundException(Exception):
pass pass
class KollaUnknownBuildTypeException(Exception):
pass
class WorkerThread(Thread): class WorkerThread(Thread):
def __init__(self, queue, config): def __init__(self, queue, config):
@ -260,7 +264,8 @@ def merge_args_and_config(settings_from_config_file):
help='The base distro image tag', help='The base distro image tag',
type=str) type=str)
parser.add_argument('-t', '--type', parser.add_argument('-t', '--type',
help='The method of the Openstack install', help='The method of the Openstack install: binary,'
' source, rdo, or rhos',
type=str, type=str,
dest='install_type') dest='install_type')
parser.add_argument('--no-cache', parser.add_argument('--no-cache',
@ -339,6 +344,10 @@ class KollaWorker(object):
elif self.install_type == 'rhos': elif self.install_type == 'rhos':
self.install_type = 'binary' self.install_type = 'binary'
self.install_metatype = 'rhos' self.install_metatype = 'rhos'
else:
raise KollaUnknownBuildTypeException(
'Unknown install type'
)
self.image_prefix = self.base + '-' + self.install_type + '-' self.image_prefix = self.base + '-' + self.install_type + '-'