Removed deprecated config option hp3par_domain

The hp3par_domain config option was deprecated in the Havana release.
This just removes it from the code, test and config sample file
for the Icehouse release.

DocImpact

Change-Id: Ib3820cfc1b0db8a8b5755ac59d30691ce832fcea

diff --git a/cinder/tests/test_hp3par.py b/cinder/tests/test_hp3par.py
index 985b614344ec9de1660d45b0e0311b22b5e56bc2..af2b95106ca5bc062a9875e2f8ac7ac4a5cf5cb6 100644 (file)
--- a/cinder/tests/test_hp3par.py
+++ b/cinder/tests/test_hp3par.py
@@ -408,7 +408,6 @@ class HP3PARBaseDriver():
         configuration.hp3par_username = 'testUser'
         configuration.hp3par_password = 'testPassword'
         configuration.hp3par_api_url = 'https://1.1.1.1/api/v1'
-        configuration.hp3par_domain = HP3PAR_DOMAIN
         configuration.hp3par_cpg = HP3PAR_CPG
         configuration.hp3par_cpg_snap = HP3PAR_CPG_SNAP
         configuration.iscsi_ip_address = '1.1.1.2'

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index 5c1b09fa4a0f1be83e6df63670839390ad14cf85..654fb30ea1f12127db867eda1ae11833fc329507 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -75,11 +75,6 @@ hp3par_opts = [
                default='',
                help="3PAR Super user password",
                secret=True),
-    # TODO(kmartin): Remove hp3par_domain during I release.
-    cfg.StrOpt('hp3par_domain',
-               default=None,
-               help="This option is DEPRECATED and no longer used. "
-                    "The 3par domain name to use."),
     cfg.StrOpt('hp3par_cpg',
                default="OpenStack",
                help="The CPG to use for volume creation"),
@@ -116,10 +111,11 @@ class HP3PARCommon(object):
         1.2.1 - Check that the VVS exists
         1.2.2 - log prior to raising exceptions
         1.2.3 - Methods to update key/value pair bug #1258033
+        1.2.4 - Remove deprecated config option hp3par_domain
 
     """
 
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
 
     stats = {}
 
@@ -143,10 +139,6 @@ class HP3PARCommon(object):
         self.config = config
         self.hosts_naming_dict = dict()
         self.client = None
-        if CONF.hp3par_domain is not None:
-            LOG.deprecated(_("hp3par_domain has been deprecated and "
-                             "is no longer used. The domain is automatically "
-                             "looked up based on the CPG."))
 
     def get_version(self):
         return self.VERSION

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 2b206cee377a5da5d401b4e7ad8e00abbadf2c4e..9b0dc61f386f3ff484aa0a56384ac59d4b2f461a 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -1528,10 +1528,6 @@
 # 3PAR Super user password (string value)
 #hp3par_password=
 
-# This option is DEPRECATED and no longer used. The 3par
-# domain name to use. (string value)
-#hp3par_domain=<None>
-
 # The CPG to use for volume creation (string value)
 #hp3par_cpg=OpenStack