diff options
| -rw-r--r-- | glance_store/_drivers/cinder.py | 2 | ||||
| -rw-r--r-- | glance_store/tests/unit/test_cinder_store.py | 2 | ||||
| -rw-r--r-- | glance_store/tests/unit/test_multistore_cinder.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1915602-fcc807a435d8a6bf.yaml | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py index 3160a75..c54b7b9 100644 --- a/glance_store/_drivers/cinder.py +++ b/glance_store/_drivers/cinder.py @@ -53,7 +53,7 @@ LOG = logging.getLogger(__name__) _CINDER_OPTS = [ cfg.StrOpt('cinder_catalog_info', - default='volumev2::publicURL', + default='volumev3::publicURL', help=""" Information to match when looking for cinder in the service catalog. diff --git a/glance_store/tests/unit/test_cinder_store.py b/glance_store/tests/unit/test_cinder_store.py index 858bcbd..93ca896 100644 --- a/glance_store/tests/unit/test_cinder_store.py +++ b/glance_store/tests/unit/test_cinder_store.py @@ -61,7 +61,7 @@ class TestCinderStore(base.StoreBaseTest, fake_sc = [{u'endpoints': [{u'publicURL': u'http://foo/public_url'}], u'endpoints_links': [], u'name': u'cinder', - u'type': u'volumev2'}] + u'type': u'volumev3'}] self.context = FakeObject(service_catalog=fake_sc, user_id='fake_user', auth_token='fake_token', diff --git a/glance_store/tests/unit/test_multistore_cinder.py b/glance_store/tests/unit/test_multistore_cinder.py index 4a9a76f..cfcfabb 100644 --- a/glance_store/tests/unit/test_multistore_cinder.py +++ b/glance_store/tests/unit/test_multistore_cinder.py @@ -87,7 +87,7 @@ class TestMultiCinderStore(base.MultiStoreBaseTest, fake_sc = [{u'endpoints': [{u'publicURL': u'http://foo/public_url'}], u'endpoints_links': [], u'name': u'cinder', - u'type': u'volumev2'}] + u'type': u'volumev3'}] self.context = FakeObject(service_catalog=fake_sc, user_id='fake_user', auth_token='fake_token', diff --git a/releasenotes/notes/bug-1915602-fcc807a435d8a6bf.yaml b/releasenotes/notes/bug-1915602-fcc807a435d8a6bf.yaml new file mode 100644 index 0000000..f7869f7 --- /dev/null +++ b/releasenotes/notes/bug-1915602-fcc807a435d8a6bf.yaml @@ -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. |