openstack
/
cinder
Code Issues Proposed changes

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
This commit is contained in:
Kurt Martin 2014-01-06 09:06:18 -08:00
parent 24d7e24413
commit 724c077fa6
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/tests/test_hp3par.py
View File

@ -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'

12
cinder/volume/drivers/san/hp/hp_3par_common.py
View File

@ -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

4
etc/cinder/cinder.conf.sample
View File

@ -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