Cinder store: Use v3 API by default

v2 API of cinder is already deprecated, and the cinder community is now
planning to remove it.
This change makes cinder store use v3 API instead, which is the current
latest version actively maintainced.

Closes-Bug: #1915602
Change-Id: I8f374eb1b26ec408c52c6279da79cfe470d59a1c
This commit is contained in:
Takashi Kajinami 2021-02-13 18:24:53 +09:00
parent d05024afc3
commit 77b61a952e
4 changed files with 9 additions and 3 deletions

View File

@ -53,7 +53,7 @@ LOG = logging.getLogger(__name__)
_CINDER_OPTS = [ _CINDER_OPTS = [
cfg.StrOpt('cinder_catalog_info', cfg.StrOpt('cinder_catalog_info',
default='volumev2::publicURL', default='volumev3::publicURL',
help=""" help="""
Information to match when looking for cinder in the service catalog. Information to match when looking for cinder in the service catalog.

View File

@ -61,7 +61,7 @@ class TestCinderStore(base.StoreBaseTest,
fake_sc = [{u'endpoints': [{u'publicURL': u'http://foo/public_url'}], fake_sc = [{u'endpoints': [{u'publicURL': u'http://foo/public_url'}],
u'endpoints_links': [], u'endpoints_links': [],
u'name': u'cinder', u'name': u'cinder',
u'type': u'volumev2'}] u'type': u'volumev3'}]
self.context = FakeObject(service_catalog=fake_sc, self.context = FakeObject(service_catalog=fake_sc,
user_id='fake_user', user_id='fake_user',
auth_token='fake_token', auth_token='fake_token',

View File

@ -87,7 +87,7 @@ class TestMultiCinderStore(base.MultiStoreBaseTest,
fake_sc = [{u'endpoints': [{u'publicURL': u'http://foo/public_url'}], fake_sc = [{u'endpoints': [{u'publicURL': u'http://foo/public_url'}],
u'endpoints_links': [], u'endpoints_links': [],
u'name': u'cinder', u'name': u'cinder',
u'type': u'volumev2'}] u'type': u'volumev3'}]
self.context = FakeObject(service_catalog=fake_sc, self.context = FakeObject(service_catalog=fake_sc,
user_id='fake_user', user_id='fake_user',
auth_token='fake_token', auth_token='fake_token',

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Default value of the ``cinder_catalog_info`` parameter has been changed
from ``volumev2::publicURL`` to ``volumev3::publicURL``, so that
the current v3 API is used by default instead of the deprecated v2 API.