remove default=None for config options

In the cfg module default=None is set as the default value.

Change-Id: Idb78d3e25c79aba0d74fdd747efe2e17b6faa129
Closes-Bug: #1323975
This commit is contained in:
Christian Berendt 2014-05-28 09:28:45 +02:00
parent 0f9e4a16ba
commit ca1ea053e4
5 changed files with 6 additions and 10 deletions

View File

@ -40,7 +40,6 @@ except ImportError:
cloud_opts = [
cfg.StrOpt('region_name',
default=None,
help=_('Region for connecting to services.'))
]
cfg.CONF.register_opts(cloud_opts)

View File

@ -33,7 +33,6 @@ logger = logging.getLogger(__name__)
opts = [
cfg.StrOpt('auth_uri',
default=None,
help=_("Authentication Endpoint URI.")),
cfg.BoolOpt('multi_cloud',
default=False,

View File

@ -56,7 +56,6 @@ service_opts = [
help='Instance connection to CFN/CW API validate certs if SSL '
'is used.'),
cfg.StrOpt('region_name_for_services',
default=None,
help='Default region name used to get services endpoints.'),
cfg.StrOpt('heat_stack_user_role',
default="heat_stack_user",

View File

@ -62,11 +62,11 @@ api_opts = [
help=_("Number of backlog requests "
"to configure the socket with."),
deprecated_group='DEFAULT'),
cfg.StrOpt('cert_file', default=None,
cfg.StrOpt('cert_file',
help=_("Location of the SSL certificate file "
"to use for SSL mode."),
deprecated_group='DEFAULT'),
cfg.StrOpt('key_file', default=None,
cfg.StrOpt('key_file',
help=_("Location of the SSL key file to use "
"for enabling SSL mode."),
deprecated_group='DEFAULT'),
@ -96,11 +96,11 @@ api_cfn_opts = [
help=_("Number of backlog requests "
"to configure the socket with."),
deprecated_group='DEFAULT'),
cfg.StrOpt('cert_file', default=None,
cfg.StrOpt('cert_file',
help=_("Location of the SSL certificate file "
"to use for SSL mode."),
deprecated_group='DEFAULT'),
cfg.StrOpt('key_file', default=None,
cfg.StrOpt('key_file',
help=_("Location of the SSL key file to use "
"for enabling SSL mode."),
deprecated_group='DEFAULT'),
@ -130,11 +130,11 @@ api_cw_opts = [
help=_("Number of backlog requests "
"to configure the socket with."),
deprecated_group='DEFAULT'),
cfg.StrOpt('cert_file', default=None,
cfg.StrOpt('cert_file',
help=_("Location of the SSL certificate file "
"to use for SSL mode."),
deprecated_group='DEFAULT'),
cfg.StrOpt('key_file', default=None,
cfg.StrOpt('key_file',
help=_("Location of the SSL key file to use "
"for enabling SSL mode."),
deprecated_group='DEFAULT'),

View File

@ -197,7 +197,6 @@ lb_template_default = r'''
# Allow user to provide alternative nested stack template to the above
loadbalancer_opts = [
cfg.StrOpt('loadbalancer_template',
default=None,
help='Custom template for the built-in '
'loadbalancer nested stack.')]
cfg.CONF.register_opts(loadbalancer_opts)