Use volume v3 API by default
Currently ec2api uses the volume v2 API by default, but v2 API was deprecated a while ago and will be removed fron cinder shortly. This patch ensures that ec2api uses the volume v3 API instead by default. Closes-Bug: #1908993 Change-Id: I280d3c009893c67d215b0c7106eec7fe2435c335
This commit is contained in:
parent
87bf822283
commit
eb3b4851a9
|
@ -20,7 +20,7 @@
|
||||||
* - **[DEFAULT]**
|
* - **[DEFAULT]**
|
||||||
-
|
-
|
||||||
|
|
||||||
* - ``cinder_service_type`` = ``volumev2``
|
* - ``cinder_service_type`` = ``volumev3``
|
||||||
|
|
||||||
- (String) Service type of Volume API, registered in Keystone catalog.
|
- (String) Service type of Volume API, registered in Keystone catalog.
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ ec2_opts = [
|
||||||
'If it is obsolete v2, a lot of useful EC2 compliant '
|
'If it is obsolete v2, a lot of useful EC2 compliant '
|
||||||
'instance properties will be unavailable.'),
|
'instance properties will be unavailable.'),
|
||||||
cfg.StrOpt('cinder_service_type',
|
cfg.StrOpt('cinder_service_type',
|
||||||
default='volumev2',
|
default='volumev3',
|
||||||
help='Service type of Volume API, registered in Keystone '
|
help='Service type of Volume API, registered in Keystone '
|
||||||
'catalog.'),
|
'catalog.'),
|
||||||
]
|
]
|
||||||
|
|
|
@ -116,7 +116,7 @@ class ClientsTestCase(base.BaseTestCase):
|
||||||
context = mock.NonCallableMock(session=mock.sentinel.session)
|
context = mock.NonCallableMock(session=mock.sentinel.session)
|
||||||
res = clients.cinder(context)
|
res = clients.cinder(context)
|
||||||
self.assertEqual(cinder.return_value, res)
|
self.assertEqual(cinder.return_value, res)
|
||||||
cinder.assert_called_with('2', service_type='volumev2',
|
cinder.assert_called_with('2', service_type='volumev3',
|
||||||
session=mock.sentinel.session)
|
session=mock.sentinel.session)
|
||||||
|
|
||||||
@mock.patch('keystoneclient.client.Client')
|
@mock.patch('keystoneclient.client.Client')
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Default value of the ``cinder_service_type`` parameter has been changed
|
||||||
|
from ``volumev2`` to ``volume3``, because volume v2 API was already
|
||||||
|
deprecated and v3 API should be used instead.
|
Loading…
Reference in New Issue