From 3f631351e4002deb69c3eccfafdc350863ff5d71 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Wed, 22 Aug 2018 14:59:16 -0500 Subject: [PATCH] Remove flashsystem_multipath_enabled opt This config option was deprecated in Mitaka and is now being removed. Change-Id: Iba7db13ca6877eebc2c7998c74086358e7b745e1 Signed-off-by: Sean McGinnis --- cinder/opts.py | 3 --- cinder/volume/drivers/ibm/flashsystem_fc.py | 11 ----------- ...remove-flashsystem-multipath-0a3ee133ebe35d1e.yaml | 6 ++++++ 3 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 releasenotes/notes/remove-flashsystem-multipath-0a3ee133ebe35d1e.yaml diff --git a/cinder/opts.py b/cinder/opts.py index 2708a41fbee..d1e86de494a 100644 --- a/cinder/opts.py +++ b/cinder/opts.py @@ -108,8 +108,6 @@ from cinder.volume.drivers.huawei import huawei_driver as \ cinder_volume_drivers_huawei_huaweidriver from cinder.volume.drivers.ibm import flashsystem_common as \ cinder_volume_drivers_ibm_flashsystemcommon -from cinder.volume.drivers.ibm import flashsystem_fc as \ - cinder_volume_drivers_ibm_flashsystemfc from cinder.volume.drivers.ibm import flashsystem_iscsi as \ cinder_volume_drivers_ibm_flashsystemiscsi from cinder.volume.drivers.ibm import gpfs as cinder_volume_drivers_ibm_gpfs @@ -300,7 +298,6 @@ def list_opts(): cinder_volume_drivers_hpe_hpelefthandiscsi.hpelefthand_opts, cinder_volume_drivers_huawei_huaweidriver.huawei_opts, cinder_volume_drivers_ibm_flashsystemcommon.flashsystem_opts, - cinder_volume_drivers_ibm_flashsystemfc.flashsystem_fc_opts, cinder_volume_drivers_ibm_flashsystemiscsi. flashsystem_iscsi_opts, cinder_volume_drivers_ibm_gpfs.gpfs_opts, diff --git a/cinder/volume/drivers/ibm/flashsystem_fc.py b/cinder/volume/drivers/ibm/flashsystem_fc.py index e1027c38c1e..1192351f12e 100644 --- a/cinder/volume/drivers/ibm/flashsystem_fc.py +++ b/cinder/volume/drivers/ibm/flashsystem_fc.py @@ -35,23 +35,13 @@ from cinder import exception from cinder.i18n import _ from cinder import interface from cinder import utils -from cinder.volume import configuration from cinder.volume.drivers.ibm import flashsystem_common as fscommon from cinder.volume.drivers.san import san from cinder.zonemanager import utils as fczm_utils LOG = logging.getLogger(__name__) -flashsystem_fc_opts = [ - cfg.BoolOpt('flashsystem_multipath_enabled', - default=False, - help='This option no longer has any affect. It is deprecated ' - 'and will be removed in the next release.', - deprecated_for_removal=True) -] - CONF = cfg.CONF -CONF.register_opts(flashsystem_fc_opts, group=configuration.SHARED_CONF_GROUP) @interface.volumedriver @@ -92,7 +82,6 @@ class FlashSystemFCDriver(fscommon.FlashSystemDriver): def __init__(self, *args, **kwargs): super(FlashSystemFCDriver, self).__init__(*args, **kwargs) self.configuration.append_config_values(fscommon.flashsystem_opts) - self.configuration.append_config_values(flashsystem_fc_opts) self.configuration.append_config_values(san.san_opts) def _check_vdisk_params(self, params): diff --git a/releasenotes/notes/remove-flashsystem-multipath-0a3ee133ebe35d1e.yaml b/releasenotes/notes/remove-flashsystem-multipath-0a3ee133ebe35d1e.yaml new file mode 100644 index 00000000000..788937c5771 --- /dev/null +++ b/releasenotes/notes/remove-flashsystem-multipath-0a3ee133ebe35d1e.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The IBM FlashSystem configuration options ``flashsystem_multipath_enabled`` + was deprecated in the Mitaka release. It had no effect, so it can be safely + removed and does not have a new equivalent config option.