From: Eric Harney <eharney@redhat.com>
Date: Tue, 30 Jun 2015 15:06:40 +0000 (-0400)
Subject: Remove lio_initiator_iqns config option
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b9a35777b37365c3f3e17e6feff1356d341443b9;p=openstack-build%2Fcinder-build.git

Remove lio_initiator_iqns config option

This has been unneeded since
 67dd248 LIO iSCSI initiator ACL auto-config
and was deprecated in Kilo.

DocImpact: removes config option

Change-Id: Idbabcd8b7d6f278d11edf105d448d39eefc5e25a
---

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 61142ffa0..9c6cd52d1 100644
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -113,10 +113,6 @@ volume_opts = [
     cfg.StrOpt('chiscsi_conf',
                default='/etc/chelsio-iscsi/chiscsi.conf',
                help='Chiscsi (CXT) global defaults configuration file'),
-    cfg.StrOpt('lio_initiator_iqns',
-               default='',
-               help='This option is deprecated and unused. '
-                    'It will be removed in the next release.'),
     cfg.StrOpt('iscsi_iotype',
                default='fileio',
                choices=['blockio', 'fileio', 'auto'],
diff --git a/cinder/volume/targets/lio.py b/cinder/volume/targets/lio.py
index 05fdf97f5..81fa8fd0a 100644
--- a/cinder/volume/targets/lio.py
+++ b/cinder/volume/targets/lio.py
@@ -30,12 +30,6 @@ class LioAdm(iscsi.ISCSITarget):
         # FIXME(jdg): modify executor to use the cinder-rtstool
         self.iscsi_target_prefix =\
             self.configuration.safe_get('iscsi_target_prefix')
-        self.lio_initiator_iqns =\
-            self.configuration.safe_get('lio_initiator_iqns')
-
-        if self.lio_initiator_iqns is not None:
-            LOG.warning(_LW("The lio_initiator_iqns option has been "
-                            "deprecated and no longer has any effect."))
 
         self._verify_rtstool()