openstack
/
nova
Code Issues Proposed changes

Use v1 as default for cinder_catalog_info 

In c5402ef4fc we recently
added support for the Cinder v2 client. This change modified
the default value of the cinder_catalog_info config such
that an end user who was previously using the Cinder V1
API via the default config setting (by not setting it) would
have a broken Nova -> cinder configuration upon upgrade.

We should hold off on changing the default cinder_catalog_info
for one release to allow for proper deprecation.

Change-Id: I040b2c87ad0a2be92f31264e293794d97c27c965
Closes-bug: #1354499
This commit is contained in:
Dan Prince 2014-08-08 12:29:47 -04:00
parent 29d174e541
commit c55736d9fc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/tests/test_cinder.py
View File

@ -257,8 +257,6 @@ class CinderTestCase(test.NoDBTestCase):
"name": "cinder",
"endpoints": [{"publicURL": "http://localhost:8776/v1/project_id"}]
}]
cinder.CONF.set_override('cinder_catalog_info',
'volume:cinder:publicURL')
self.context = context.RequestContext('username', 'project_id',
service_catalog=catalog)
cinder.cinderclient(self.context)
@ -332,8 +330,11 @@ class CinderV2TestCase(test.NoDBTestCase):
"name": "cinderv2",
"endpoints": [{"publicURL": "http://localhost:8776/v2/project_id"}]
}]
cinder.CONF.set_override('cinder_catalog_info',
'volumev2:cinder:publicURL')
self.context = context.RequestContext('username', 'project_id',
service_catalog=catalog)
cinder.cinderclient(self.context)
self.api = cinder.API()

2
nova/volume/cinder.py
View File

@ -36,7 +36,7 @@ from nova.openstack.common import strutils
cinder_opts = [
cfg.StrOpt('cinder_catalog_info',
default='volumev2:cinder:publicURL',
default='volume:cinder:publicURL',
help='Info to match when looking for cinder in the service '
'catalog. Format is: separated values of the form: '
'<service_type>:<service_name>:<endpoint_type>'),