From 7c968deb238b2f29b1092f114488c40b4e9ac51f Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Mon, 9 Nov 2015 16:00:32 +0800 Subject: [PATCH] Remove default=None for config options In the cfg module default=None is set as the default value. Change-Id: Icc0bed350bbe566a8ddfbc614e4254d02cd079f6 Partial-bug: #1323975 --- glance/api/versions.py | 2 +- glance/async/flows/convert.py | 1 - glance/common/config.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/glance/api/versions.py b/glance/api/versions.py index 9e6dbfb727..0407719400 100644 --- a/glance/api/versions.py +++ b/glance/api/versions.py @@ -25,7 +25,7 @@ from glance import i18n _ = i18n._ versions_opts = [ - cfg.StrOpt('public_endpoint', default=None, + cfg.StrOpt('public_endpoint', help=_('Public url to use for versions endpoint. The default ' 'is None, which will use the request\'s host_url ' 'attribute to populate the URL base. If Glance is ' diff --git a/glance/async/flows/convert.py b/glance/async/flows/convert.py index a6bbdc3093..4948eb857a 100644 --- a/glance/async/flows/convert.py +++ b/glance/async/flows/convert.py @@ -31,7 +31,6 @@ LOG = logging.getLogger(__name__) convert_task_opts = [ cfg.StrOpt('conversion_format', - default=None, choices=('qcow2', 'raw', 'vmdk'), help=_("The format to which images will be automatically " "converted.")), diff --git a/glance/common/config.py b/glance/common/config.py index b50d2d4338..ebf97fc356 100644 --- a/glance/common/config.py +++ b/glance/common/config.py @@ -70,7 +70,6 @@ task_opts = [ help=_("Specifies which task executor to be used to run the " "task scripts.")), cfg.StrOpt('work_dir', - default=None, help=_('Work dir for asynchronous task operations. ' 'The directory set here will be used to operate over ' 'images - normally before they are imported in the '