openstack
/
manila
Code Issues Proposed changes

Improve help strings 

Make help strings consistent:
* Add missing spaces between words
* Capitalize first word of help
* Add "." at end of string
* Improve wording and capitalization

This follows the oslo.config style guide:
http://docs.openstack.org/developer/oslo.config/styleguide.html

Change-Id: I8243909249423b6b58ccda0d800856f46b0953c5
This commit is contained in:
Andreas Jaeger 2014-08-26 21:10:39 +02:00
parent e85bdaca65
commit ab61d9bad4
26 changed files with 140 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manila/api/middleware/sizelimit.py
View File

@ -27,9 +27,10 @@ from manila.openstack.common import log as logging
from manila import wsgi
# default request size is 112k
max_request_body_size_opt = cfg.IntOpt('osapi_max_request_body_size',
default=114688,
help='Max size for body of a request')
max_request_body_size_opt = cfg.IntOpt(
'osapi_max_request_body_size',
default=114688,
help='Maximum size for the body of a request.')
CONF = cfg.CONF
CONF.register_opt(max_request_body_size_opt)

95
manila/common/config.py
View File

@ -57,31 +57,31 @@ def _get_my_ip():
core_opts = [
cfg.StrOpt('connection_type',
default=None,
help='Virtualization api connection type : libvirt, xenapi, '
'or fake'),
help='Virtualization API connection type: libvirt, xenapi, '
'or fake.'),
cfg.StrOpt('sql_connection',
default='sqlite:///$state_path/$sqlite_db',
help='The SQLAlchemy connection string used to connect to the '
'database',
'database.',
secret=True),
cfg.IntOpt('sql_connection_debug',
default=0,
help='Verbosity of SQL debugging information. 0=None, '
'100=Everything'),
help='Verbosity of SQL debugging information: 0=None, '
'100=Everything.'),
cfg.StrOpt('api_paste_config',
default="api-paste.ini",
help='File name for the paste.deploy config for manila-api'),
help='File name for the paste.deploy config for manila-api.'),
cfg.StrOpt('pybasedir',
default=os.path.abspath(os.path.join(os.path.dirname(__file__),
'..',
'..')),
help='Directory where the manila python module is installed'),
help='Directory where the manila python module is installed.'),
cfg.StrOpt('bindir',
default='$pybasedir/bin',
help='Directory where manila binaries are installed'),
help='Directory where manila binaries are installed.'),
cfg.StrOpt('state_path',
default='$pybasedir',
help="Top-level directory for maintaining manila's state"), ]
help="Top-level directory for maintaining manila's state."), ]
debug_opts = [
]
@ -92,81 +92,81 @@ CONF.register_cli_opts(debug_opts)
global_opts = [
cfg.StrOpt('my_ip',
default=_get_my_ip(),
help='ip address of this host'),
help='IP address of this host.'),
cfg.StrOpt('glance_host',
default='$my_ip',
help='default glance hostname or ip'),
help='Default glance hostname or IP address.'),
cfg.IntOpt('glance_port',
default=9292,
help='default glance port'),
help='Default glance port.'),
cfg.ListOpt('glance_api_servers',
default=['$glance_host:$glance_port'],
help='A list of the glance api servers available to manila '
'([hostname|ip]:port)'),
help='A list of the glance API servers available to manila '
'([hostname|IP]:port).'),
cfg.IntOpt('glance_api_version',
default=1,
help='Version of the glance api to use'),
help='Version of the glance API to use.'),
cfg.IntOpt('glance_num_retries',
default=0,
help='Number retries when downloading an image from glance'),
help='Number retries when downloading an image from glance.'),
cfg.BoolOpt('glance_api_insecure',
default=False,
help='Allow to perform insecure SSL (https) requests to '
'glance'),
'glance.'),
cfg.StrOpt('scheduler_topic',
default='manila-scheduler',
help='the topic scheduler nodes listen on'),
help='The topic scheduler nodes listen on.'),
cfg.StrOpt('share_topic',
default='manila-share',
help='the topic share nodes listen on'),
help='The topic share nodes listen on.'),
cfg.BoolOpt('enable_v1_api',
default=True,
help=_("Deploy v1 of the Manila API. ")),
help=_("Deploy v1 of the Manila API.")),
cfg.BoolOpt('enable_v2_api',
default=True,
help=_("Deploy v2 of the Manila API. ")),
help=_("Deploy v2 of the Manila API.")),
cfg.BoolOpt('api_rate_limit',
default=True,
help='whether to rate limit the api'),
help='Whether to rate limit the API.'),
cfg.ListOpt('osapi_share_ext_list',
default=[],
help='Specify list of extensions to load when using osapi_'
'share_extension option with manila.api.contrib.'
'select_extensions'),
'select_extensions.'),
cfg.MultiStrOpt('osapi_share_extension',
default=['manila.api.contrib.standard_extensions'],
help='osapi share extension to load'),
help='The osapi share extension to load.'),
cfg.StrOpt('osapi_share_base_URL',
default=None,
help='Base URL that will be presented to users in links '
'to the OpenStack Share API',
'to the OpenStack Share API.',
deprecated_name='osapi_compute_link_prefix'),
cfg.IntOpt('osapi_max_limit',
default=1000,
help='the maximum number of items returned in a single '
'response from a collection resource'),
help='The maximum number of items returned in a single '
'response from a collection resource.'),
cfg.StrOpt('sqlite_db',
default='manila.sqlite',
help='the filename to use with sqlite'),
help='The filename to use with sqlite.'),
cfg.BoolOpt('sqlite_synchronous',
default=True,
help='If passed, use synchronous mode for sqlite'),
help='If passed, use synchronous mode for sqlite.'),
cfg.IntOpt('sql_idle_timeout',
default=3600,
help='timeout before idle sql connections are reaped'),
help='Timeout before idle SQL connections are reaped.'),
cfg.IntOpt('sql_max_retries',
default=10,
help='maximum db connection retries during startup. '
'(setting -1 implies an infinite retry count)'),
help='Maximum database connection retries during startup. '
'(setting -1 implies an infinite retry count).'),
cfg.IntOpt('sql_retry_interval',
default=10,
help='interval between retries of opening a sql connection'),
help='Interval between retries of opening a SQL connection.'),
cfg.StrOpt('scheduler_manager',
default='manila.scheduler.manager.SchedulerManager',
help='full class name for the Manager for scheduler'),
help='Full class name for the scheduler manager.'),
cfg.StrOpt('share_manager',
default='manila.share.manager.ShareManager',
help='full class name for the Manager for share'),
help='Full class name for the share manager.'),
cfg.StrOpt('host',
default=socket.gethostname(),
help='Name of this node. This can be an opaque identifier. '
@ -174,33 +174,34 @@ global_opts = [
# NOTE(vish): default to nova for compatibility with nova installs
cfg.StrOpt('storage_availability_zone',
default='nova',
help='availability zone of this node'),
help='Availability zone of this node.'),
cfg.ListOpt('memcached_servers',
default=None,
help='Memcached servers or None for in process cache.'),
cfg.StrOpt('share_usage_audit_period',
default='month',
help='time period to generate share usages for. '
'Time period must be hour, day, month or year'),
help='Time period to generate share usages for. '
'Time period must be hour, day, month or year.'),
cfg.StrOpt('root_helper',
default='sudo',
help='Deprecated: command to use for running commands as root'),
help='Deprecated: command to use for running commands as '
'root.'),
cfg.StrOpt('rootwrap_config',
default=None,
help='Path to the rootwrap configuration file to use for '
'running commands as root'),
'running commands as root.'),
cfg.BoolOpt('monkey_patch',
default=False,
help='Whether to log monkey patching'),
help='Whether to log monkey patching.'),
cfg.ListOpt('monkey_patch_modules',
default=[],
help='List of modules/decorators to monkey patch'),
help='List of modules or decorators to monkey patch.'),
cfg.IntOpt('service_down_time',
default=60,
help='maximum time since last check-in for up service'),
help='Maximum time since last check-in for up service.'),
cfg.StrOpt('share_api_class',
default='manila.share.api.API',
help='The full class name of the share API class to use'),
help='The full class name of the share API class to use.'),
cfg.StrOpt('auth_strategy',
default='keystone',
help='The strategy to use for auth. Supports noauth, keystone, '
@ -209,14 +210,14 @@ global_opts = [
default=None,
help='A list of backend names to use. These backend names '
'should be backed by a unique [CONFIG] group '
'with its options'),
'with its options.'),
cfg.ListOpt('enabled_share_backends',
default=None,
help='A list of share backend names to use. These backend '
'names should be backed by a unique [CONFIG] group '
'with its options'),
'with its options.'),
cfg.BoolOpt('no_snapshot_gb_quota',
default=False,
help='Whether snapshots count against GigaByte quota'), ]
help='Whether snapshots count against GigaByte quota.'), ]
CONF.register_opts(global_opts)

2
manila/compute/__init__.py
View File

@ -21,7 +21,7 @@ _compute_opts = [
oslo.config.cfg.StrOpt('compute_api_class',
default='manila.compute.nova.API',
help='The full class name of the '
'compute API class to use'),
'Compute API class to use.'),
]
oslo.config.cfg.CONF.register_opts(_compute_opts)

16
manila/compute/nova.py
View File

@ -34,32 +34,32 @@ nova_opts = [
cfg.StrOpt('nova_catalog_info',
default='compute:nova:publicURL',
help='Info to match when looking for nova in the service '
'catalog. Format is : separated values of the form: '
'catalog. Format is separated values of the form: '
'<service_type>:<service_name>:<endpoint_type>'),
cfg.StrOpt('nova_catalog_admin_info',
default='compute:nova:adminURL',
help='Same as nova_catalog_info, but for admin endpoint.'),
cfg.StrOpt('os_region_name',
default=None,
help='region name of this node'),
help='Region name of this node.'),
cfg.StrOpt('nova_ca_certificates_file',
default=None,
help='Location of ca certicates file to use for nova client '
help='Location of CA certicates file to use for nova client '
'requests.'),
cfg.BoolOpt('nova_api_insecure',
default=False,
help='Allow to perform insecure SSL requests to nova'),
help='Allow to perform insecure SSL requests to nova.'),
cfg.StrOpt('nova_admin_username',
default='nova',
help='Nova admin username'),
help='Nova admin username.'),
cfg.StrOpt('nova_admin_password',
help='Nova admin password'),
help='Nova admin password.'),
cfg.StrOpt('nova_admin_tenant_name',
default='service',
help='Nova admin tenant name'),
help='Nova admin tenant name.'),
cfg.StrOpt('nova_admin_auth_url',
default='http://localhost:5000/v2.0',
help='Identity service url'),
help='Identity service URL.'),
]
CONF = cfg.CONF

8
manila/db/api.py
View File

@ -49,17 +49,17 @@ from oslo.db import api as db_api
db_opts = [
cfg.StrOpt('db_backend',
default='sqlalchemy',
help='The backend to use for db'),
help='The backend to use for database.'),
cfg.BoolOpt('enable_new_services',
default=True,
help='Services to be added to the available pool on create'),
help='Services to be added to the available pool on create.'),
cfg.StrOpt('share_name_template',
default='share-%s',
help='Template string to be used to generate share names'),
help='Template string to be used to generate share names.'),
cfg.StrOpt('share_snapshot_name_template',
default='share-snapshot-%s',
help='Template string to be used to generate share snapshot '
'names'),
'names.'),
]
CONF = cfg.CONF

2
manila/db/base.py
View File

@ -25,7 +25,7 @@ from manila.openstack.common import importutils
db_driver_opt = cfg.StrOpt('db_driver',
default='manila.db',
help='driver to use for database access')
help='Driver to use for database access.')
CONF = cfg.CONF
CONF.register_opt(db_driver_opt)

2
manila/exception.py
View File

@ -34,7 +34,7 @@ LOG = logging.getLogger(__name__)
exc_log_opts = [
cfg.BoolOpt('fatal_exception_format_errors',
default=False,
help='make exception message format errors fatal'),
help='Whether to make exception message format errors fatal.'),
]
CONF = cfg.CONF

2
manila/network/__init__.py
View File

@ -24,7 +24,7 @@ network_opts = [
cfg.StrOpt('network_api_class',
default='manila.network.neutron.'
'neutron_network_plugin.NeutronNetworkPlugin',
help='The full class name of the network API class to use'),
help='The full class name of the Networking API class to use.'),
]
cfg.CONF.register_opts(network_opts)

2
manila/network/linux/interface.py
View File

@ -32,7 +32,7 @@ LOG = logging.getLogger(__name__)
OPTS = [
cfg.StrOpt('ovs_integration_bridge',
default='br-int',
help=_('Name of Open vSwitch bridge to use')),
help=_('Name of Open vSwitch bridge to use.')),
]
CONF = cfg.CONF

24
manila/network/neutron/api.py
View File

@ -29,47 +29,47 @@ neutron_opts = [
cfg.StrOpt('neutron_url',
default='http://127.0.0.1:9696',
deprecated_name='quantum_url',
help='URL for connecting to neutron'),
help='URL for connecting to neutron.'),
cfg.IntOpt('neutron_url_timeout',
default=30,
deprecated_name='quantum_url_timeout',
help='timeout value for connecting to neutron in seconds'),
help='Timeout value for connecting to neutron in seconds.'),
cfg.StrOpt('neutron_admin_username',
default='neutron',
deprecated_name='quantum_admin_username',
help='username for connecting to neutron in admin context'),
help='Username for connecting to neutron in admin context.'),
cfg.StrOpt('neutron_admin_password',
deprecated_name='quantum_admin_password',
help='password for connecting to neutron in admin context',
help='Password for connecting to neutron in admin context.',
secret=True),
cfg.StrOpt('neutron_admin_tenant_name',
default='service',
deprecated_name='quantum_admin_tenant_name',
help='tenant name for connecting to neutron in admin context'),
help='Tenant name for connecting to neutron in admin context.'),
cfg.StrOpt('neutron_region_name',
deprecated_name='quantum_region_name',
help='region name for connecting to neutron in admin context'),
help='Region name for connecting to neutron in admin context.'),
cfg.StrOpt('neutron_admin_auth_url',
deprecated_name='quantum_admin_auth_url',
default='http://localhost:5000/v2.0',
help='auth url for connecting to neutron in admin context'),
help='Auth URL for connecting to neutron in admin context.'),
cfg.BoolOpt('neutron_api_insecure',
default=False,
deprecated_name='quantum_api_insecure',
help='if set, ignore any SSL validation issues'),
help='If set, ignore any SSL validation issues.'),
cfg.StrOpt('neutron_auth_strategy',
default='keystone',
deprecated_name='quantum_auth_strategy',
help='auth strategy for connecting to '
'neutron in admin context'),
help='Auth strategy for connecting to '
'neutron in admin context.'),
# TODO(berrange) temporary hack until Neutron can pass over the
# name of the OVS bridge it is configured with
cfg.StrOpt('neutron_ovs_bridge',
default='br-int',
deprecated_name='quantum_ovs_bridge',
help='Name of Integration Bridge used by Open vSwitch'),
help='Name of integration bridge used by Open vSwitch.'),
cfg.StrOpt('neutron_ca_certificates_file',
help='Location of ca certificates file to use for '
help='Location of CA certificates file to use for '
'neutron client requests.'),
]

18
manila/quota.py
View File

@ -32,29 +32,29 @@ LOG = logging.getLogger(__name__)
quota_opts = [
cfg.IntOpt('quota_shares',
default=10,
help='number of shares allowed per project'),
help='Number of shares allowed per project.'),
cfg.IntOpt('quota_snapshots',
default=10,
help='number of share snapshots allowed per project'),
help='Number of share snapshots allowed per project.'),
cfg.IntOpt('quota_gigabytes',
default=1000,
help='number of share gigabytes (snapshots are also included) '
'allowed per project'),
help='Number of share gigabytes (snapshots are also included) '
'allowed per project.'),
cfg.IntOpt('quota_share_networks',
default=5,
help='number of activated share-networks allowed per project'),
help='Number of activated share-networks allowed per project.'),
cfg.IntOpt('reservation_expire',
default=86400,
help='number of seconds until a reservation expires'),
help='Number of seconds until a reservation expires.'),
cfg.IntOpt('until_refresh',
default=0,
help='count of reservations until usage is refreshed'),
help='Count of reservations until usage is refreshed.'),
cfg.IntOpt('max_age',
default=0,
help='number of seconds between subsequent usage refreshes'),
help='Number of seconds between subsequent usage refreshes.'),
cfg.StrOpt('quota_driver',
default='manila.quota.DbQuotaDriver',
help='default driver to use for quota checks'), ]
help='Default driver to use for quota checks.'), ]
CONF = cfg.CONF
CONF.register_opts(quota_opts)

4
manila/scheduler/driver.py
View File

@ -32,10 +32,10 @@ from manila import utils
scheduler_driver_opts = [
cfg.StrOpt('scheduler_host_manager',
default='manila.scheduler.host_manager.HostManager',
help='The scheduler host manager class to use'),
help='The scheduler host manager class to use.'),
cfg.IntOpt('scheduler_max_attempts',
default=3,
help='Maximum number of attempts to schedule a share'),
help='Maximum number of attempts to schedule a share.'),
]
CONF = cfg.CONF

2
manila/scheduler/manager.py
View File

@ -36,7 +36,7 @@ LOG = logging.getLogger(__name__)
scheduler_driver_opt = cfg.StrOpt('scheduler_driver',
default='manila.scheduler.filter_scheduler.'
'FilterScheduler',
help='Default scheduler driver to use')
help='Default scheduler driver to use.')
CONF = cfg.CONF
CONF.register_opt(scheduler_driver_opt)

2
manila/scheduler/simple.py
View File

@ -32,7 +32,7 @@ from manila import utils
simple_scheduler_opts = [
cfg.IntOpt("max_gigabytes",
default=10000,
help="maximum number of volume gigabytes to allow per host"), ]
help="Maximum number of volume gigabytes to allow per host."), ]
CONF = cfg.CONF
CONF.register_opts(simple_scheduler_opts)

14
manila/service.py
View File

@ -45,21 +45,21 @@ LOG = logging.getLogger(__name__)
service_opts = [
cfg.IntOpt('report_interval',
default=10,
help='seconds between nodes reporting state to datastore'),
help='Seconds between nodes reporting state to datastore.'),
cfg.IntOpt('periodic_interval',
default=60,
help='seconds between running periodic tasks'),
help='Seconds between running periodic tasks.'),
cfg.IntOpt('periodic_fuzzy_delay',
default=60,
help='range of seconds to randomly delay when starting the'
' periodic task scheduler to reduce stampeding.'
' (Disable by setting to 0)'),
help='Range of seconds to randomly delay when starting the '
'periodic task scheduler to reduce stampeding. '
'(Disable by setting to 0)'),
cfg.StrOpt('osapi_share_listen',
default="0.0.0.0",
help='IP address for OpenStack Share API to listen'),
help='IP address for OpenStack Share API to listen on.'),
cfg.IntOpt('osapi_share_listen_port',
default=8786,
help='port for os share api to listen'), ]
help='Port for OpenStack Share API to listen on.'), ]
CONF = cfg.CONF
CONF.register_opts(service_opts)

7
manila/share/driver.py
View File

@ -34,13 +34,14 @@ share_opts = [
# NOTE(rushiagr): Reasonable to define this option at only one place.
cfg.IntOpt('num_shell_tries',
default=3,
help='number of times to attempt to run flakey shell commands'),
help='Number of times to attempt to run flakey shell '
'commands.'),
cfg.IntOpt('reserved_share_percentage',
default=0,
help='The percentage of backend capacity reserved'),
help='The percentage of backend capacity reserved.'),
cfg.StrOpt('share_backend_name',
default=None,
help='The backend name for a given driver implementation'),
help='The backend name for a given driver implementation.'),
]
CONF = cfg.CONF

2
manila/share/drivers/emc/driver.py
View File

@ -39,7 +39,7 @@ EMC_NAS_OPTS = [
help='Password for the EMC server.'),
cfg.StrOpt('emc_nas_server',
default=None,
help='EMC server hostname or ip-address.'),
help='EMC server hostname or IP address.'),
cfg.IntOpt('emc_nas_server_port',
default=8080,
help='Port number for the EMC server.'),

2
manila/share/drivers/generic.py
View File

@ -59,7 +59,7 @@ share_opts = [
help="Maximum time to wait for attaching cinder volume."),
cfg.StrOpt('service_instance_smb_config_path',
default='$share_mount_path/smb.conf',
help="Path to smb config in service instance."),
help="Path to SMB config in service instance."),
cfg.ListOpt('share_helpers',
default=[
'CIFS=manila.share.drivers.generic.CIFSHelper',

7
manila/share/drivers/glusterfs.py
View File

@ -42,11 +42,12 @@ LOG = logging.getLogger(__name__)
GlusterfsManilaShare_opts = [
cfg.StrOpt('glusterfs_volumes_config',
default='/etc/manila/glusterfs_volumes',
help='File with the list of Gluster volumes that can'
'be used to create shares'),
help='File with the list of Gluster volumes that can '
'be used to create shares.'),
cfg.StrOpt('glusterfs_mount_point_base',
default='$state_path/mnt',
help='Base dir containing mount points for Gluster volumes.'),
help='Base directory containing mount points for Gluster '
'volumes.'),
]
CONF = cfg.CONF

4
manila/share/drivers/netapp/cluster_mode.py
View File

@ -58,8 +58,8 @@ NETAPP_NAS_OPTS = [
help='Lif name template'),
cfg.StrOpt('netapp_aggregate_name_search_pattern',
default='(.*)',
help='Pattern for searching available aggregates'
' for provisioning.'),
help='Pattern for searching available aggregates '
'for provisioning.'),
cfg.StrOpt('netapp_root_volume_aggregate',
help='Name of aggregate to create root volume on.'),
cfg.StrOpt('netapp_root_volume_name',

6
manila/share/drivers/service_instance.py
View File

@ -80,9 +80,9 @@ server_opts = [
help="CIDR of manila service network."),
cfg.IntOpt('service_network_division_mask',
default=28,
help="This mask is used for dividing service network into"
"subnets, ip capacity of subnet with this mask directly"
"defines possible amount of created service VMs"
help="This mask is used for dividing service network into "
"subnets, IP capacity of subnet with this mask directly "
"defines possible amount of created service VMs "
"per tenant's subnet."),
cfg.StrOpt('interface_driver',
default='manila.network.linux.interface.OVSInterfaceDriver',

6
manila/share/manager.py
View File

@ -39,11 +39,11 @@ LOG = logging.getLogger(__name__)
share_manager_opts = [
cfg.StrOpt('share_driver',
default='manila.share.drivers.generic.GenericShareDriver',
help='Driver to use for share creation'),
help='Driver to use for share creation.'),
cfg.BoolOpt('delete_share_server_with_last_share',
default=False,
help='With this option is set to True share server will'
'be deleted on deletion of last share'),
help='Whether share servers will '
'be deleted on deletion of the last share.'),
]
CONF = cfg.CONF

4
manila/test.py
View File

@ -44,10 +44,10 @@ from manila.tests import fake_notifier
test_opts = [
cfg.StrOpt('sqlite_clean_db',
default='clean.sqlite',
help='File name of clean sqlite db'),
help='File name of clean sqlite database.'),
cfg.BoolOpt('fake_tests',
default=True,
help='should we use everything for testing'), ]
help='Whether to use everything for testing.'), ]
CONF = cfg.CONF
CONF.register_opts(test_opts)

2
manila/volume/__init__.py
View File

@ -23,7 +23,7 @@ _volume_opts = [
oslo.config.cfg.StrOpt('volume_api_class',
default='manila.volume.cinder.API',
help='The full class name of the '
'volume API class to use'),
'Volume API class to use.'),
]
oslo.config.cfg.CONF.register_opts(_volume_opts)

22
manila/volume/cinder.py
View File

@ -37,34 +37,34 @@ cinder_opts = [
cfg.StrOpt('cinder_catalog_info',
default='volume:cinder:publicURL',
help='Info to match when looking for cinder in the service '
'catalog. Format is : separated values of the form: '
'catalog. Format is separated values of the form: '
'<service_type>:<service_name>:<endpoint_type>'),
cfg.StrOpt('os_region_name',
help='region name of this node'),
help='Region name of this node.'),
cfg.StrOpt('cinder_ca_certificates_file',
help='Location of ca certificates file to use for cinder '
help='Location of CA certificates file to use for cinder '
'client requests.'),
cfg.IntOpt('cinder_http_retries',
default=3,
help='Number of cinderclient retries on failed http calls'),
help='Number of cinderclient retries on failed HTTP calls.'),
cfg.BoolOpt('cinder_api_insecure',
default=False,
help='Allow to perform insecure SSL requests to cinder'),
help='Allow to perform insecure SSL requests to cinder.'),
cfg.BoolOpt('cinder_cross_az_attach',
default=True,
help='Allow attach between instance and volume in different '
'availability zones.'),
help='Allow attaching between instances and volumes in '
'different availability zones.'),
cfg.StrOpt('cinder_admin_username',
default='cinder',
help='Cinder admin username'),
help='Cinder admin username.'),
cfg.StrOpt('cinder_admin_password',
help='Cinder admin password'),
help='Cinder admin password.'),
cfg.StrOpt('cinder_admin_tenant_name',
default='service',
help='Cinder admin tenant name'),
help='Cinder admin tenant name.'),
cfg.StrOpt('cinder_admin_auth_url',
default='http://localhost:5000/v2.0',
help='Identity service url')
help='Identity service URL.')
]
CONF = cfg.CONF

13
manila/wsgi.py
View File

@ -42,7 +42,8 @@ from manila.openstack.common import log as logging
socket_opts = [
cfg.IntOpt('backlog',
default=4096,
help="Number of backlog requests to configure the socket with"),
help="Number of backlog requests to configure the socket "
"with."),
cfg.IntOpt('tcp_keepidle',
default=600,
help="Sets the value of TCP_KEEPIDLE in seconds for each "
@ -50,23 +51,23 @@ socket_opts = [
cfg.StrOpt('ssl_ca_file',
default=None,
help="CA certificate file to use to verify "
"connecting clients"),
"connecting clients."),
cfg.StrOpt('ssl_cert_file',
default=None,
help="Certificate file to use when starting "
"the server securely"),
"the server securely."),
cfg.StrOpt('ssl_key_file',
default=None,
help="Private key file to use when starting "
"the server securely"),
"the server securely."),
]
eventlet_opts = [
cfg.IntOpt('max_header_line',
default=16384,
help="Maximum line size of message headers to be accepted. "
"max_header_line may need to be increased when using "
"large tokens (typically those generated by the "
"Option max_header_line may need to be increased when "
"using large tokens (typically those generated by the "
"Keystone v3 API with big service catalogs)."),
]