openstack/cinder
Code Issues Proposed changes

Merge "Remove dothill driver options"

Browse Source
This commit is contained in:
Jenkins 2017-07-22 03:17:50 +00:00 committed by Gerrit Code Review
commit 18f81357b7
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/opts.py
View File

@ -97,8 +97,6 @@ from cinder.volume.drivers.dell_emc import xtremio as \
cinder_volume_drivers_dell_emc_xtremio
from cinder.volume.drivers.disco import disco as \
cinder_volume_drivers_disco_disco
from cinder.volume.drivers.dothill import dothill_common as \
cinder_volume_drivers_dothill_dothillcommon
from cinder.volume.drivers import drbdmanagedrv as \
cinder_volume_drivers_drbdmanagedrv
from cinder.volume.drivers.falconstor import fss_common as \
@ -317,8 +315,6 @@ def list_opts():
cinder_volume_drivers_dell_emc_vnx_common.VNX_OPTS,
cinder_volume_drivers_dell_emc_xtremio.XTREMIO_OPTS,
cinder_volume_drivers_disco_disco.disco_opts,
cinder_volume_drivers_dothill_dothillcommon.common_opts,
cinder_volume_drivers_dothill_dothillcommon.iscsi_opts,
cinder_volume_drivers_drbdmanagedrv.drbd_opts,
cinder_volume_drivers_falconstor_fsscommon.FSS_OPTS,
cinder_volume_drivers_fujitsu_eternusdxcommon.

28
cinder/volume/drivers/dothill/dothill_common.py
View File

@ -28,39 +28,11 @@ from oslo_log import log as logging
from cinder import exception
from cinder.i18n import _
from cinder.objects import fields
from cinder.volume import configuration
from cinder.volume.drivers.dothill import dothill_client as dothill
LOG = logging.getLogger(__name__)
common_opts = [
cfg.StrOpt('dothill_backend_name',
default='A',
help="Pool or Vdisk name to use for volume creation."),
cfg.StrOpt('dothill_backend_type',
choices=['linear', 'virtual'],
default='virtual',
help="linear (for Vdisk) or virtual (for Pool)."),
cfg.StrOpt('dothill_api_protocol',
choices=['http', 'https'],
default='https',
help="DotHill API interface protocol."),
cfg.BoolOpt('dothill_verify_certificate',
default=False,
help="Whether to verify DotHill array SSL certificate."),
cfg.StrOpt('dothill_verify_certificate_path',
help="DotHill array SSL certificate path."),
]
iscsi_opts = [
cfg.ListOpt('dothill_iscsi_ips',
default=[],
help="List of comma-separated target iSCSI IP addresses."),
]
CONF = cfg.CONF
CONF.register_opts(common_opts, group=configuration.SHARED_CONF_GROUP)
CONF.register_opts(iscsi_opts, group=configuration.SHARED_CONF_GROUP)
class DotHillCommon(object):