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:
parent
0f9e4a16ba
commit
ca1ea053e4
|
@ -40,7 +40,6 @@ except ImportError:
|
||||||
|
|
||||||
cloud_opts = [
|
cloud_opts = [
|
||||||
cfg.StrOpt('region_name',
|
cfg.StrOpt('region_name',
|
||||||
default=None,
|
|
||||||
help=_('Region for connecting to services.'))
|
help=_('Region for connecting to services.'))
|
||||||
]
|
]
|
||||||
cfg.CONF.register_opts(cloud_opts)
|
cfg.CONF.register_opts(cloud_opts)
|
||||||
|
|
|
@ -33,7 +33,6 @@ logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
opts = [
|
opts = [
|
||||||
cfg.StrOpt('auth_uri',
|
cfg.StrOpt('auth_uri',
|
||||||
default=None,
|
|
||||||
help=_("Authentication Endpoint URI.")),
|
help=_("Authentication Endpoint URI.")),
|
||||||
cfg.BoolOpt('multi_cloud',
|
cfg.BoolOpt('multi_cloud',
|
||||||
default=False,
|
default=False,
|
||||||
|
|
|
@ -56,7 +56,6 @@ service_opts = [
|
||||||
help='Instance connection to CFN/CW API validate certs if SSL '
|
help='Instance connection to CFN/CW API validate certs if SSL '
|
||||||
'is used.'),
|
'is used.'),
|
||||||
cfg.StrOpt('region_name_for_services',
|
cfg.StrOpt('region_name_for_services',
|
||||||
default=None,
|
|
||||||
help='Default region name used to get services endpoints.'),
|
help='Default region name used to get services endpoints.'),
|
||||||
cfg.StrOpt('heat_stack_user_role',
|
cfg.StrOpt('heat_stack_user_role',
|
||||||
default="heat_stack_user",
|
default="heat_stack_user",
|
||||||
|
|
|
@ -62,11 +62,11 @@ api_opts = [
|
||||||
help=_("Number of backlog requests "
|
help=_("Number of backlog requests "
|
||||||
"to configure the socket with."),
|
"to configure the socket with."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
cfg.StrOpt('cert_file', default=None,
|
cfg.StrOpt('cert_file',
|
||||||
help=_("Location of the SSL certificate file "
|
help=_("Location of the SSL certificate file "
|
||||||
"to use for SSL mode."),
|
"to use for SSL mode."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
cfg.StrOpt('key_file', default=None,
|
cfg.StrOpt('key_file',
|
||||||
help=_("Location of the SSL key file to use "
|
help=_("Location of the SSL key file to use "
|
||||||
"for enabling SSL mode."),
|
"for enabling SSL mode."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
|
@ -96,11 +96,11 @@ api_cfn_opts = [
|
||||||
help=_("Number of backlog requests "
|
help=_("Number of backlog requests "
|
||||||
"to configure the socket with."),
|
"to configure the socket with."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
cfg.StrOpt('cert_file', default=None,
|
cfg.StrOpt('cert_file',
|
||||||
help=_("Location of the SSL certificate file "
|
help=_("Location of the SSL certificate file "
|
||||||
"to use for SSL mode."),
|
"to use for SSL mode."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
cfg.StrOpt('key_file', default=None,
|
cfg.StrOpt('key_file',
|
||||||
help=_("Location of the SSL key file to use "
|
help=_("Location of the SSL key file to use "
|
||||||
"for enabling SSL mode."),
|
"for enabling SSL mode."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
|
@ -130,11 +130,11 @@ api_cw_opts = [
|
||||||
help=_("Number of backlog requests "
|
help=_("Number of backlog requests "
|
||||||
"to configure the socket with."),
|
"to configure the socket with."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
cfg.StrOpt('cert_file', default=None,
|
cfg.StrOpt('cert_file',
|
||||||
help=_("Location of the SSL certificate file "
|
help=_("Location of the SSL certificate file "
|
||||||
"to use for SSL mode."),
|
"to use for SSL mode."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
cfg.StrOpt('key_file', default=None,
|
cfg.StrOpt('key_file',
|
||||||
help=_("Location of the SSL key file to use "
|
help=_("Location of the SSL key file to use "
|
||||||
"for enabling SSL mode."),
|
"for enabling SSL mode."),
|
||||||
deprecated_group='DEFAULT'),
|
deprecated_group='DEFAULT'),
|
||||||
|
|
|
@ -197,7 +197,6 @@ lb_template_default = r'''
|
||||||
# Allow user to provide alternative nested stack template to the above
|
# Allow user to provide alternative nested stack template to the above
|
||||||
loadbalancer_opts = [
|
loadbalancer_opts = [
|
||||||
cfg.StrOpt('loadbalancer_template',
|
cfg.StrOpt('loadbalancer_template',
|
||||||
default=None,
|
|
||||||
help='Custom template for the built-in '
|
help='Custom template for the built-in '
|
||||||
'loadbalancer nested stack.')]
|
'loadbalancer nested stack.')]
|
||||||
cfg.CONF.register_opts(loadbalancer_opts)
|
cfg.CONF.register_opts(loadbalancer_opts)
|
||||||
|
|
Loading…
Reference in New Issue