Remove dothill driver options
The dothill driver has been marked unsupported for some time now and has been disabled as a standalone driver. Since the driver can no longer be used it doesn't make sense to keep the dothill_* options in the code. The drivers that use the dothill driver use lenovo_ and hpmsa_ named options instead. This patch removes the unused options. Change-Id: I96afd3d7ecde564d8e79f325d3713e52d8529921
This commit is contained in:
parent
81bc3a0763
commit
d1ee31d739
|
@ -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,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):
|
||||
|
|
Loading…
Reference in New Issue