From 0997e913a8c808e2b53123b91749817b9da868ee Mon Sep 17 00:00:00 2001 From: Rongze Zhu Date: Tue, 1 Sep 2015 10:32:39 +0800 Subject: [PATCH] Remove deprecated options These options are deprecated and unused, this commit remove them. - iscsi_num_targets - iser_num_targets Change-Id: I46597a827f33fc338a11c31434bb0d967b35b003 --- cinder/volume/driver.py | 8 -------- cinder/volume/targets/iscsi.py | 8 -------- 2 files changed, 16 deletions(-) diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index 36111157e..c681b24ab 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -48,10 +48,6 @@ volume_opts = [ default=0, min=0, max=100, help='The percentage of backend capacity is reserved'), - cfg.IntOpt('iscsi_num_targets', - default=None, - help='This option is deprecated and unused. ' - 'It will be removed in the Liberty release.'), cfg.StrOpt('iscsi_target_prefix', default='iqn.2010-10.org.openstack:', help='Prefix for iSCSI volumes'), @@ -257,10 +253,6 @@ iser_opts = [ default=3, help='The maximum number of times to rescan iSER target' 'to find volume'), - cfg.IntOpt('iser_num_targets', - default=None, - help='This option is deprecated and unused. ' - 'It will be removed in the Liberty release.'), cfg.StrOpt('iser_target_prefix', default='iqn.2010-10.org.openstack:', help='Prefix for iSER volumes'), diff --git a/cinder/volume/targets/iscsi.py b/cinder/volume/targets/iscsi.py index b37535a1b..792c06eec 100644 --- a/cinder/volume/targets/iscsi.py +++ b/cinder/volume/targets/iscsi.py @@ -14,7 +14,6 @@ import abc from oslo_concurrency import processutils from oslo_log import log as logging -from oslo_log import versionutils from cinder import exception from cinder.i18n import _, _LI, _LW, _LE @@ -43,13 +42,6 @@ class ISCSITarget(driver.Target): self.protocol = 'iSCSI' self.volumes_dir = self.configuration.safe_get('volumes_dir') - # If any of the deprecated options are set, we'll warn the operator. - msg = _LW("The option %s has been deprecated and no longer has " - "any effect. It will be removed in the Liberty release.") - for opt in ('iscsi_num_targets', 'iser_num_targets'): - if self.configuration.safe_get(opt) is not None: - versionutils.report_deprecated_feature(LOG, msg, opt) - def _get_iscsi_properties(self, volume, multipath=False): """Gets iscsi configuration -- 2.45.2