openstack/cinder
Code Issues Proposed changes

Merge "RBD: uppercase rbd_opts for consistency"

Browse Source
This commit is contained in:
Jenkins 2016-07-07 04:23:40 +00:00 committed by Gerrit Code Review
commit 5c40bf9225
2 changed files with 4 additions and 4 deletions
cinder
opts.py
volume/drivers
rbd.py

2
cinder/opts.py

@ -293,7 +293,7 @@ def list_opts():
cinder_volume_drivers_infortrend_eonstor_ds_cli_commoncli.
infortrend_esds_extra_opts,
cinder_volume_drivers_hitachi_hnasiscsi.iSCSI_OPTS,
cinder_volume_drivers_rbd.rbd_opts,
cinder_volume_drivers_rbd.RBD_OPTS,
cinder_volume_drivers_tintri.tintri_opts,
cinder_backup_api.backup_api_opts,
cinder_volume_drivers_hitachi_hbsdhorcm.volume_opts,

6
cinder/volume/drivers/rbd.py

@ -44,7 +44,7 @@ except ImportError:
LOG = logging.getLogger(__name__)
rbd_opts = [
RBD_OPTS = [
cfg.StrOpt('rbd_cluster_name',
default='ceph',
help='The name of ceph cluster'),
@ -90,7 +90,7 @@ rbd_opts = [
]
CONF = cfg.CONF
CONF.register_opts(rbd_opts)
CONF.register_opts(RBD_OPTS)
class RBDImageMetadata(object):
@ -272,7 +272,7 @@ class RBDDriver(driver.TransferVD, driver.ExtendVD,
def __init__(self, *args, **kwargs):
super(RBDDriver, self).__init__(*args, **kwargs)
self.configuration.append_config_values(rbd_opts)
self.configuration.append_config_values(RBD_OPTS)
self._stats = {}
# allow overrides for testing
self.rados = kwargs.get('rados', rados)