Config bindings: remove redundant brackets
There were cases where the help text had redundant brackets. This was removed. TrivialFix Change-Id: I5f9b715b2f358d5b7db1a36f7bf9922d461771be
This commit is contained in:
@@ -32,9 +32,9 @@ from nova import wsgi
|
|||||||
auth_opts = [
|
auth_opts = [
|
||||||
cfg.BoolOpt('api_rate_limit',
|
cfg.BoolOpt('api_rate_limit',
|
||||||
default=False,
|
default=False,
|
||||||
help=('Whether to use per-user rate limiting for the api. '
|
help='Whether to use per-user rate limiting for the api. '
|
||||||
'This option is only used by v2 api. Rate limiting '
|
'This option is only used by v2 api. Rate limiting '
|
||||||
'is removed from v3 api.')),
|
'is removed from v3 api.'),
|
||||||
cfg.StrOpt('auth_strategy',
|
cfg.StrOpt('auth_strategy',
|
||||||
default='keystone',
|
default='keystone',
|
||||||
help='The strategy to use for auth: noauth or keystone.'),
|
help='The strategy to use for auth: noauth or keystone.'),
|
||||||
|
|||||||
@@ -43,8 +43,8 @@ metadata_opts = [
|
|||||||
cfg.StrOpt('config_drive_skip_versions',
|
cfg.StrOpt('config_drive_skip_versions',
|
||||||
default=('1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 '
|
default=('1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 '
|
||||||
'2007-12-15 2008-02-01 2008-09-01'),
|
'2007-12-15 2008-02-01 2008-09-01'),
|
||||||
help=('List of metadata versions to skip placing into the '
|
help='List of metadata versions to skip placing into the '
|
||||||
'config drive')),
|
'config drive'),
|
||||||
cfg.StrOpt('vendordata_driver',
|
cfg.StrOpt('vendordata_driver',
|
||||||
default='nova.api.metadata.vendordata_json.JsonFileVendorData',
|
default='nova.api.metadata.vendordata_json.JsonFileVendorData',
|
||||||
help='Driver to use for vendor data'),
|
help='Driver to use for vendor data'),
|
||||||
|
|||||||
@@ -36,15 +36,15 @@ CONF = cfg.CONF
|
|||||||
os_network_opts = [
|
os_network_opts = [
|
||||||
cfg.BoolOpt("enable_network_quota",
|
cfg.BoolOpt("enable_network_quota",
|
||||||
default=False,
|
default=False,
|
||||||
help=('Enables or disables quota checking for tenant '
|
help='Enables or disables quota checking for tenant '
|
||||||
'networks')),
|
'networks'),
|
||||||
cfg.StrOpt('use_neutron_default_nets',
|
cfg.StrOpt('use_neutron_default_nets',
|
||||||
default="False",
|
default="False",
|
||||||
help=('Control for checking for default networks')),
|
help='Control for checking for default networks'),
|
||||||
cfg.StrOpt('neutron_default_tenant_id',
|
cfg.StrOpt('neutron_default_tenant_id',
|
||||||
default="default",
|
default="default",
|
||||||
help=('Default tenant id when creating neutron '
|
help='Default tenant id when creating neutron '
|
||||||
'networks')),
|
'networks'),
|
||||||
cfg.IntOpt('quota_networks',
|
cfg.IntOpt('quota_networks',
|
||||||
default=3,
|
default=3,
|
||||||
help='Number of private networks allowed per project'),
|
help='Number of private networks allowed per project'),
|
||||||
|
|||||||
@@ -160,9 +160,9 @@ interval_opts = [
|
|||||||
'when shelved'),
|
'when shelved'),
|
||||||
cfg.IntOpt('instance_delete_interval',
|
cfg.IntOpt('instance_delete_interval',
|
||||||
default=300,
|
default=300,
|
||||||
help=('Interval in seconds for retrying failed instance file '
|
help='Interval in seconds for retrying failed instance file '
|
||||||
'deletes. Set to -1 to disable. '
|
'deletes. Set to -1 to disable. '
|
||||||
'Setting this to 0 will run at the default rate.')),
|
'Setting this to 0 will run at the default rate.'),
|
||||||
cfg.IntOpt('block_device_allocate_retries_interval',
|
cfg.IntOpt('block_device_allocate_retries_interval',
|
||||||
default=3,
|
default=3,
|
||||||
help='Waiting time interval (seconds) between block'
|
help='Waiting time interval (seconds) between block'
|
||||||
@@ -213,8 +213,8 @@ running_deleted_opts = [
|
|||||||
instance_cleaning_opts = [
|
instance_cleaning_opts = [
|
||||||
cfg.IntOpt('maximum_instance_delete_attempts',
|
cfg.IntOpt('maximum_instance_delete_attempts',
|
||||||
default=5,
|
default=5,
|
||||||
help=('The number of times to attempt to reap an instance\'s '
|
help='The number of times to attempt to reap an instance\'s '
|
||||||
'files.')),
|
'files.'),
|
||||||
]
|
]
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|||||||
@@ -43,12 +43,12 @@ serial_opts = [
|
|||||||
help='Location of serial console proxy.'),
|
help='Location of serial console proxy.'),
|
||||||
cfg.StrOpt('listen',
|
cfg.StrOpt('listen',
|
||||||
default='127.0.0.1',
|
default='127.0.0.1',
|
||||||
help=('IP address on which instance serial console '
|
help='IP address on which instance serial console '
|
||||||
'should listen')),
|
'should listen'),
|
||||||
cfg.StrOpt('proxyclient_address',
|
cfg.StrOpt('proxyclient_address',
|
||||||
default='127.0.0.1',
|
default='127.0.0.1',
|
||||||
help=('The address to which proxy clients '
|
help='The address to which proxy clients '
|
||||||
'(like nova-serialproxy) should connect')),
|
'(like nova-serialproxy) should connect'),
|
||||||
]
|
]
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|||||||
@@ -117,8 +117,8 @@ linux_net_opts = [
|
|||||||
'always be on the bottom.'),
|
'always be on the bottom.'),
|
||||||
cfg.StrOpt('iptables_drop_action',
|
cfg.StrOpt('iptables_drop_action',
|
||||||
default='DROP',
|
default='DROP',
|
||||||
help=('The table that iptables to jump to when a packet is '
|
help='The table that iptables to jump to when a packet is '
|
||||||
'to be dropped.')),
|
'to be dropped.'),
|
||||||
cfg.IntOpt('ovs_vsctl_timeout',
|
cfg.IntOpt('ovs_vsctl_timeout',
|
||||||
default=120,
|
default=120,
|
||||||
help='Amount of time, in seconds, that ovs_vsctl should wait '
|
help='Amount of time, in seconds, that ovs_vsctl should wait '
|
||||||
|
|||||||
@@ -46,8 +46,8 @@ quota_opts = [
|
|||||||
help='Number of floating IPs allowed per project'),
|
help='Number of floating IPs allowed per project'),
|
||||||
cfg.IntOpt('quota_fixed_ips',
|
cfg.IntOpt('quota_fixed_ips',
|
||||||
default=-1,
|
default=-1,
|
||||||
help=('Number of fixed IPs allowed per project (this should be '
|
help='Number of fixed IPs allowed per project (this should be '
|
||||||
'at least the number of instances allowed)')),
|
'at least the number of instances allowed)'),
|
||||||
cfg.IntOpt('quota_metadata_items',
|
cfg.IntOpt('quota_metadata_items',
|
||||||
default=128,
|
default=128,
|
||||||
help='Number of metadata items allowed per instance'),
|
help='Number of metadata items allowed per instance'),
|
||||||
|
|||||||
@@ -75,11 +75,11 @@ opts = [
|
|||||||
help='Ironic keystone tenant name.'),
|
help='Ironic keystone tenant name.'),
|
||||||
cfg.IntOpt('api_max_retries',
|
cfg.IntOpt('api_max_retries',
|
||||||
default=60,
|
default=60,
|
||||||
help=('How many retries when a request does conflict.')),
|
help='How many retries when a request does conflict.'),
|
||||||
cfg.IntOpt('api_retry_interval',
|
cfg.IntOpt('api_retry_interval',
|
||||||
default=2,
|
default=2,
|
||||||
help=('How often to retry in seconds when a request '
|
help='How often to retry in seconds when a request '
|
||||||
'does conflict')),
|
'does conflict'),
|
||||||
]
|
]
|
||||||
|
|
||||||
ironic_group = cfg.OptGroup(name='ironic',
|
ironic_group = cfg.OptGroup(name='ironic',
|
||||||
|
|||||||
Reference in New Issue
Block a user