Merge "Remove duplicated statement of parameter choices of config options"

This commit is contained in:
Zuul 2017-12-05 14:06:43 +00:00 committed by Gerrit Code Review
commit cfa3e7d679

@ -180,8 +180,7 @@ hostarch = os.uname()[4]
_CLI_OPTS = [
cfg.StrOpt('base', short='b', default='centos',
choices=BASE_OS_DISTRO,
help='The distro type of the base image. Allowed values '
'are ' + ', '.join(BASE_OS_DISTRO)),
help='The distro type of the base image.'),
cfg.StrOpt('base-tag', default='latest',
help='The base distro image tag'),
cfg.StrOpt('base-image',
@ -238,8 +237,7 @@ _CLI_OPTS = [
cfg.StrOpt('type', short='t', default='binary',
choices=INSTALL_TYPE_CHOICES,
dest='install_type',
help=('The method of the OpenStack install. Allowed values '
'are ' + ', '.join(INSTALL_TYPE_CHOICES))),
help=('The method of the OpenStack install.')),
cfg.IntOpt('threads', short='T', default=8, min=1,
help=('The number of threads to use while building.'
' (Note: setting to one will allow real time'