remove default=None for config options
In the cfg module default=None is set as the default value. It's not necessary to set default=None when defining new parameters. Closes-Bug: #1323975 Change-Id: Ibd52063cf30ca7b5565b09ed4602c15d5def3645
This commit is contained in:
Christian Berendt
David Stanek
parent
7c476298ab
commit
035a6dee7b
|
|
@ -110,7 +110,7 @@ FILE_OPTIONS = {
|
|||
help='Sets the value of TCP_KEEPIDLE in seconds for each '
|
||||
'server socket. Only applies if tcp_keepalive is '
|
||||
'true. Not supported on OS X.'),
|
||||
cfg.IntOpt('list_limit', default=None,
|
||||
cfg.IntOpt('list_limit',
|
||||
help='The maximum number of entities that will be '
|
||||
'returned in a collection, with no limit set by '
|
||||
'default. This global limit may be then overridden '
|
||||
|
|
@ -164,7 +164,7 @@ FILE_OPTIONS = {
|
|||
cfg.IntOpt('max_password_length', default=4096,
|
||||
help='Maximum supported length for user passwords; '
|
||||
'decrease to improve performance.'),
|
||||
cfg.IntOpt('list_limit', default=None,
|
||||
cfg.IntOpt('list_limit',
|
||||
help='Maximum number of entities that will be returned in '
|
||||
'an identity collection.'),
|
||||
],
|
||||
|
|
@ -193,7 +193,7 @@ FILE_OPTIONS = {
|
|||
cfg.IntOpt('expiration', default=3600,
|
||||
help='Amount of time a token should remain valid '
|
||||
'(in seconds).'),
|
||||
cfg.StrOpt('provider', default=None,
|
||||
cfg.StrOpt('provider',
|
||||
help='Controls the token construction, validation, and '
|
||||
'revocation operations. Core providers are '
|
||||
'"keystone.token.providers.[pkiz|pki|uuid].'
|
||||
|
|
@ -209,7 +209,7 @@ FILE_OPTIONS = {
|
|||
'events if revoke extension is enabled (in seconds). '
|
||||
'This has no effect unless global and token '
|
||||
'caching are enabled.'),
|
||||
cfg.IntOpt('cache_time', default=None,
|
||||
cfg.IntOpt('cache_time',
|
||||
help='Time to cache tokens (in seconds). This has no '
|
||||
'effect unless global and token caching are '
|
||||
'enabled.'),
|
||||
|
|
@ -327,7 +327,7 @@ FILE_OPTIONS = {
|
|||
'certificate).'),
|
||||
],
|
||||
'signing': [
|
||||
cfg.StrOpt('token_format', default=None,
|
||||
cfg.StrOpt('token_format',
|
||||
help='Deprecated in favor of provider in the '
|
||||
'[token] section.'),
|
||||
cfg.StrOpt('certfile',
|
||||
|
|
@ -361,15 +361,15 @@ FILE_OPTIONS = {
|
|||
# assignment has no default for backward compatibility reasons.
|
||||
# If assignment driver is not specified, the identity driver chooses
|
||||
# the backend
|
||||
cfg.StrOpt('driver', default=None,
|
||||
cfg.StrOpt('driver',
|
||||
help='Assignment backend driver.'),
|
||||
cfg.BoolOpt('caching', default=True,
|
||||
help='Toggle for assignment caching. This has no effect '
|
||||
'unless global caching is enabled.'),
|
||||
cfg.IntOpt('cache_time', default=None,
|
||||
cfg.IntOpt('cache_time',
|
||||
help='TTL (in seconds) to cache assignment data. This has '
|
||||
'no effect unless global caching is enabled.'),
|
||||
cfg.IntOpt('list_limit', default=None,
|
||||
cfg.IntOpt('list_limit',
|
||||
help='Maximum number of entities that will be returned '
|
||||
'in an assignment collection.'),
|
||||
],
|
||||
|
|
@ -401,7 +401,7 @@ FILE_OPTIONS = {
|
|||
cfg.StrOpt('driver',
|
||||
default='keystone.policy.backends.sql.Policy',
|
||||
help='Policy backend driver.'),
|
||||
cfg.IntOpt('list_limit', default=None,
|
||||
cfg.IntOpt('list_limit',
|
||||
help='Maximum number of entities that will be returned '
|
||||
'in a policy collection.'),
|
||||
],
|
||||
|
|
@ -428,9 +428,9 @@ FILE_OPTIONS = {
|
|||
'ldap': [
|
||||
cfg.StrOpt('url', default='ldap://localhost',
|
||||
help='URL for connecting to the LDAP server.'),
|
||||
cfg.StrOpt('user', default=None,
|
||||
cfg.StrOpt('user',
|
||||
help='User BindDN to query the LDAP server.'),
|
||||
cfg.StrOpt('password', secret=True, default=None,
|
||||
cfg.StrOpt('password', secret=True,
|
||||
help='Password for the BindDN to query the LDAP server.'),
|
||||
cfg.StrOpt('suffix', default='cn=example,cn=com',
|
||||
help='LDAP server suffix'),
|
||||
|
|
@ -458,17 +458,17 @@ FILE_OPTIONS = {
|
|||
'"finding" or "default". The "default" option falls '
|
||||
'back to using default dereferencing configured by '
|
||||
'your ldap.conf.'),
|
||||
cfg.IntOpt('debug_level', default=None,
|
||||
cfg.IntOpt('debug_level',
|
||||
help='Sets the LDAP debugging level for LDAP calls. '
|
||||
'A value of 0 means that debugging is not enabled. '
|
||||
'This value is a bitmask, consult your LDAP '
|
||||
'documentation for possible values.'),
|
||||
cfg.BoolOpt('chase_referrals', default=None,
|
||||
cfg.BoolOpt('chase_referrals',
|
||||
help='Override the system\'s default referral chasing '
|
||||
'behavior for queries.'),
|
||||
cfg.StrOpt('user_tree_dn', default=None,
|
||||
cfg.StrOpt('user_tree_dn',
|
||||
help='Search base for users.'),
|
||||
cfg.StrOpt('user_filter', default=None,
|
||||
cfg.StrOpt('user_filter',
|
||||
help='LDAP search filter for users.'),
|
||||
cfg.StrOpt('user_objectclass', default='inetOrgPerson',
|
||||
help='LDAP objectclass for users.'),
|
||||
|
|
@ -501,7 +501,7 @@ FILE_OPTIONS = {
|
|||
default=['default_project_id', 'tenants'],
|
||||
help='List of attributes stripped off the user on '
|
||||
'update.'),
|
||||
cfg.StrOpt('user_default_project_id_attribute', default=None,
|
||||
cfg.StrOpt('user_default_project_id_attribute',
|
||||
help='LDAP attribute mapped to default_project_id for '
|
||||
'users.'),
|
||||
cfg.BoolOpt('user_allow_create', default=True,
|
||||
|
|
@ -515,7 +515,7 @@ FILE_OPTIONS = {
|
|||
'determine if a user is enabled or not by checking '
|
||||
'if they are a member of the '
|
||||
'"user_enabled_emulation_dn" group.'),
|
||||
cfg.StrOpt('user_enabled_emulation_dn', default=None,
|
||||
cfg.StrOpt('user_enabled_emulation_dn',
|
||||
help='DN of the group entry to hold enabled users when '
|
||||
'using enabled emulation.'),
|
||||
cfg.ListOpt('user_additional_attribute_mapping',
|
||||
|
|
@ -526,11 +526,11 @@ FILE_OPTIONS = {
|
|||
'ldap_attr is the attribute in the LDAP entry and '
|
||||
'user_attr is the Identity API attribute.'),
|
||||
|
||||
cfg.StrOpt('project_tree_dn', default=None,
|
||||
cfg.StrOpt('project_tree_dn',
|
||||
deprecated_opts=[cfg.DeprecatedOpt(
|
||||
'tenant_tree_dn', group='ldap')],
|
||||
help='Search base for projects'),
|
||||
cfg.StrOpt('project_filter', default=None,
|
||||
cfg.StrOpt('project_filter',
|
||||
deprecated_opts=[cfg.DeprecatedOpt(
|
||||
'tenant_filter', group='ldap')],
|
||||
help='LDAP search filter for projects.'),
|
||||
|
|
@ -588,7 +588,7 @@ FILE_OPTIONS = {
|
|||
'determine if a project is enabled or not by '
|
||||
'checking if they are a member of the '
|
||||
'"project_enabled_emulation_dn" group.'),
|
||||
cfg.StrOpt('project_enabled_emulation_dn', default=None,
|
||||
cfg.StrOpt('project_enabled_emulation_dn',
|
||||
deprecated_opts=[cfg.DeprecatedOpt(
|
||||
'tenant_enabled_emulation_dn', group='ldap')],
|
||||
help='DN of the group entry to hold enabled projects when '
|
||||
|
|
@ -603,9 +603,9 @@ FILE_OPTIONS = {
|
|||
'attribute in the LDAP entry and user_attr is the '
|
||||
'Identity API attribute.'),
|
||||
|
||||
cfg.StrOpt('role_tree_dn', default=None,
|
||||
cfg.StrOpt('role_tree_dn',
|
||||
help='Search base for roles.'),
|
||||
cfg.StrOpt('role_filter', default=None,
|
||||
cfg.StrOpt('role_filter',
|
||||
help='LDAP search filter for roles.'),
|
||||
cfg.StrOpt('role_objectclass', default='organizationalRole',
|
||||
help='LDAP objectclass for roles.'),
|
||||
|
|
@ -631,9 +631,9 @@ FILE_OPTIONS = {
|
|||
'ldap_attr is the attribute in the LDAP entry and '
|
||||
'user_attr is the Identity API attribute.'),
|
||||
|
||||
cfg.StrOpt('group_tree_dn', default=None,
|
||||
cfg.StrOpt('group_tree_dn',
|
||||
help='Search base for groups.'),
|
||||
cfg.StrOpt('group_filter', default=None,
|
||||
cfg.StrOpt('group_filter',
|
||||
help='LDAP search filter for groups.'),
|
||||
cfg.StrOpt('group_objectclass', default='groupOfNames',
|
||||
help='LDAP objectclass for groups.'),
|
||||
|
|
@ -661,10 +661,10 @@ FILE_OPTIONS = {
|
|||
'ldap_attr is the attribute in the LDAP entry and '
|
||||
'user_attr is the Identity API attribute.'),
|
||||
|
||||
cfg.StrOpt('tls_cacertfile', default=None,
|
||||
cfg.StrOpt('tls_cacertfile',
|
||||
help='CA certificate file path for communicating with '
|
||||
'LDAP servers.'),
|
||||
cfg.StrOpt('tls_cacertdir', default=None,
|
||||
cfg.StrOpt('tls_cacertdir',
|
||||
help='CA certificate directory path for communicating with '
|
||||
'LDAP servers.'),
|
||||
cfg.BoolOpt('use_tls', default=False,
|
||||
|
|
@ -708,7 +708,7 @@ FILE_OPTIONS = {
|
|||
cfg.StrOpt('driver',
|
||||
default='keystone.catalog.backends.sql.Catalog',
|
||||
help='Catalog backend driver.'),
|
||||
cfg.IntOpt('list_limit', default=None,
|
||||
cfg.IntOpt('list_limit',
|
||||
help='Maximum number of entities that will be returned '
|
||||
'in a catalog collection.'),
|
||||
],
|
||||
|
|
@ -752,10 +752,10 @@ def configure(conf=None):
|
|||
cfg.BoolOpt('standard-threads', default=False,
|
||||
help='Do not monkey-patch threading system modules.'))
|
||||
conf.register_cli_opt(
|
||||
cfg.StrOpt('pydev-debug-host', default=None,
|
||||
cfg.StrOpt('pydev-debug-host',
|
||||
help='Host to connect to for remote debugger.'))
|
||||
conf.register_cli_opt(
|
||||
cfg.IntOpt('pydev-debug-port', default=None,
|
||||
cfg.IntOpt('pydev-debug-port',
|
||||
help='Port to connect to for remote debugger.'))
|
||||
|
||||
for section in FILE_OPTIONS:
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ from keystone.openstack.common import log
|
|||
|
||||
notifier_opts = [
|
||||
cfg.StrOpt('default_publisher_id',
|
||||
default=None,
|
||||
help='Default publisher_id for outgoing notifications'),
|
||||
]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue