openstack/cinder
Code Issues Proposed changes

Merge "Remove translation from config options"

Browse Source
This commit is contained in:
Jenkins 2016-07-05 22:16:46 +00:00 committed by Gerrit Code Review
commit 4c7bd2dd21
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/common/config.py
View File

@ -32,8 +32,6 @@ from oslo_log import log as logging
from oslo_middleware import cors
from oslo_utils import netutils
from cinder.i18n import _
CONF = cfg.CONF
logging.register_options(CONF)
@ -96,14 +94,14 @@ global_opts = [
cfg.BoolOpt('enable_v1_api',
default=True,
deprecated_for_removal=True,
help=_("DEPRECATED: Deploy v1 of the Cinder API.")),
help="DEPRECATED: Deploy v1 of the Cinder API."),
cfg.BoolOpt('enable_v2_api',
default=True,
deprecated_for_removal=True,
help=_("DEPRECATED: Deploy v2 of the Cinder API.")),
help="DEPRECATED: Deploy v2 of the Cinder API."),
cfg.BoolOpt('enable_v3_api',
default=True,
help=_("Deploy v3 of the Cinder API.")),
help="Deploy v3 of the Cinder API."),
cfg.BoolOpt('api_rate_limit',
default=True,
help='Enables or disables rate limit of the API.'),

22
cinder/volume/drivers/blockbridge.py
View File

@ -37,29 +37,29 @@ LOG = logging.getLogger(__name__)
blockbridge_opts = [
cfg.StrOpt("blockbridge_api_host",
help=_("IP address/hostname of Blockbridge API.")),
help="IP address/hostname of Blockbridge API."),
cfg.IntOpt("blockbridge_api_port",
help=_("Override HTTPS port to connect to Blockbridge "
"API server.")),
help="Override HTTPS port to connect to Blockbridge "
"API server."),
cfg.StrOpt("blockbridge_auth_scheme",
default='token',
choices=['token', 'password'],
help=_("Blockbridge API authentication scheme (token "
"or password)")),
help="Blockbridge API authentication scheme (token "
"or password)"),
cfg.StrOpt("blockbridge_auth_token",
help=_("Blockbridge API token (for auth scheme 'token')"),
help="Blockbridge API token (for auth scheme 'token')",
secret=True),
cfg.StrOpt("blockbridge_auth_user",
help=_("Blockbridge API user (for auth scheme 'password')")),
help="Blockbridge API user (for auth scheme 'password')"),
cfg.StrOpt("blockbridge_auth_password",
help=_("Blockbridge API password (for auth scheme 'password')"),
help="Blockbridge API password (for auth scheme 'password')",
secret=True),
cfg.DictOpt("blockbridge_pools",
default={'OpenStack': '+openstack'},
help=_("Defines the set of exposed pools and their associated "
"backend query strings")),
help="Defines the set of exposed pools and their associated "
"backend query strings"),
cfg.StrOpt("blockbridge_default_pool",
help=_("Default pool name if unspecified.")),
help="Default pool name if unspecified."),
]
CONF = cfg.CONF

18
cinder/volume/drivers/rbd.py
View File

@ -75,18 +75,18 @@ rbd_opts = [
'taken before a flatten occurs. Set to 0 to disable '
'cloning.'),
cfg.IntOpt('rbd_store_chunk_size', default=4,
help=_('Volumes will be chunked into objects of this size '
'(in megabytes).')),
help='Volumes will be chunked into objects of this size '
'(in megabytes).'),
cfg.IntOpt('rados_connect_timeout', default=-1,
help=_('Timeout value (in seconds) used when connecting to '
'ceph cluster. If value < 0, no timeout is set and '
'default librados value is used.')),
help='Timeout value (in seconds) used when connecting to '
'ceph cluster. If value < 0, no timeout is set and '
'default librados value is used.'),
cfg.IntOpt('rados_connection_retries', default=3,
help=_('Number of retries if connection to ceph cluster '
'failed.')),
help='Number of retries if connection to ceph cluster '
'failed.'),
cfg.IntOpt('rados_connection_interval', default=5,
help=_('Interval value (in seconds) between connection '
'retries to ceph cluster.'))
help='Interval value (in seconds) between connection '
'retries to ceph cluster.')
]
CONF = cfg.CONF