diff --git a/nova/api/auth.py b/nova/api/auth.py index 9ac7c59906ae..f61c21828575 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -32,9 +32,9 @@ from nova import wsgi auth_opts = [ cfg.BoolOpt('api_rate_limit', default=False, - help=('Whether to use per-user rate limiting for the api. ' - 'This option is only used by v2 api. Rate limiting ' - 'is removed from v3 api.')), + help='Whether to use per-user rate limiting for the api. ' + 'This option is only used by v2 api. Rate limiting ' + 'is removed from v3 api.'), cfg.StrOpt('auth_strategy', default='keystone', help='The strategy to use for auth: noauth or keystone.'), diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 2d17bc7e9240..323231c7c1c2 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -42,8 +42,8 @@ metadata_opts = [ cfg.StrOpt('config_drive_skip_versions', default=('1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 ' '2007-12-15 2008-02-01 2008-09-01'), - help=('List of metadata versions to skip placing into the ' - 'config drive')), + help='List of metadata versions to skip placing into the ' + 'config drive'), cfg.StrOpt('vendordata_driver', default='nova.api.metadata.vendordata_json.JsonFileVendorData', help='Driver to use for vendor data'), diff --git a/nova/api/openstack/compute/contrib/os_tenant_networks.py b/nova/api/openstack/compute/contrib/os_tenant_networks.py index ce3aeffd6e1a..3109e22d4369 100644 --- a/nova/api/openstack/compute/contrib/os_tenant_networks.py +++ b/nova/api/openstack/compute/contrib/os_tenant_networks.py @@ -36,15 +36,15 @@ CONF = cfg.CONF os_network_opts = [ cfg.BoolOpt("enable_network_quota", default=False, - help=('Enables or disables quota checking for tenant ' - 'networks')), + help='Enables or disables quota checking for tenant ' + 'networks'), cfg.StrOpt('use_neutron_default_nets', default="False", - help=('Control for checking for default networks')), + help='Control for checking for default networks'), cfg.StrOpt('neutron_default_tenant_id', default="default", - help=('Default tenant id when creating neutron ' - 'networks')), + help='Default tenant id when creating neutron ' + 'networks'), cfg.IntOpt('quota_networks', default=3, help='Number of private networks allowed per project'), diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 899a41369d36..ee05bc91f8b9 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -161,9 +161,9 @@ interval_opts = [ 'when shelved'), cfg.IntOpt('instance_delete_interval', default=300, - help=('Interval in seconds for retrying failed instance file ' - 'deletes. Set to -1 to disable. ' - 'Setting this to 0 will run at the default rate.')), + help='Interval in seconds for retrying failed instance file ' + 'deletes. Set to -1 to disable. ' + 'Setting this to 0 will run at the default rate.'), cfg.IntOpt('block_device_allocate_retries_interval', default=3, help='Waiting time interval (seconds) between block' @@ -214,8 +214,8 @@ running_deleted_opts = [ instance_cleaning_opts = [ cfg.IntOpt('maximum_instance_delete_attempts', default=5, - help=('The number of times to attempt to reap an instance\'s ' - 'files.')), + help='The number of times to attempt to reap an instance\'s ' + 'files.'), ] CONF = cfg.CONF diff --git a/nova/console/serial.py b/nova/console/serial.py index 18476e737b02..3b4c6a37fee6 100644 --- a/nova/console/serial.py +++ b/nova/console/serial.py @@ -43,12 +43,12 @@ serial_opts = [ help='Location of serial console proxy.'), cfg.StrOpt('listen', default='127.0.0.1', - help=('IP address on which instance serial console ' - 'should listen')), + help='IP address on which instance serial console ' + 'should listen'), cfg.StrOpt('proxyclient_address', default='127.0.0.1', - help=('The address to which proxy clients ' - '(like nova-serialproxy) should connect')), + help='The address to which proxy clients ' + '(like nova-serialproxy) should connect'), ] CONF = cfg.CONF diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 447e4cba8e8b..9f225d5d5171 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -119,8 +119,8 @@ linux_net_opts = [ 'always be on the bottom.'), cfg.StrOpt('iptables_drop_action', default='DROP', - help=('The table that iptables to jump to when a packet is ' - 'to be dropped.')), + help='The table that iptables to jump to when a packet is ' + 'to be dropped.'), cfg.IntOpt('ovs_vsctl_timeout', default=120, help='Amount of time, in seconds, that ovs_vsctl should wait ' diff --git a/nova/quota.py b/nova/quota.py index 578cbdad2996..71d0eff5cd38 100644 --- a/nova/quota.py +++ b/nova/quota.py @@ -46,8 +46,8 @@ quota_opts = [ help='Number of floating IPs allowed per project'), cfg.IntOpt('quota_fixed_ips', default=-1, - help=('Number of fixed IPs allowed per project (this should be ' - 'at least the number of instances allowed)')), + help='Number of fixed IPs allowed per project (this should be ' + 'at least the number of instances allowed)'), cfg.IntOpt('quota_metadata_items', default=128, help='Number of metadata items allowed per instance'), diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index 80d8f695aaf5..90b5a727ac10 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -76,11 +76,11 @@ opts = [ help='Ironic keystone tenant name.'), cfg.IntOpt('api_max_retries', 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', default=2, - help=('How often to retry in seconds when a request ' - 'does conflict')), + help='How often to retry in seconds when a request ' + 'does conflict'), ] ironic_group = cfg.OptGroup(name='ironic',