From 724c077fa62e93fdb4c2e43ae5521448d389d36e Mon Sep 17 00:00:00 2001 From: Kurt Martin Date: Mon, 6 Jan 2014 09:06:18 -0800 Subject: [PATCH] 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 --- cinder/tests/test_hp3par.py | 1 - cinder/volume/drivers/san/hp/hp_3par_common.py | 12 ++---------- etc/cinder/cinder.conf.sample | 4 ---- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/cinder/tests/test_hp3par.py b/cinder/tests/test_hp3par.py index 985b61434..af2b95106 100644 --- 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 5c1b09fa4..654fb30ea 100644 --- 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 2b206cee3..9b0dc61f3 100644 --- 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= - # The CPG to use for volume creation (string value) #hp3par_cpg=OpenStack -- 2.45.2