config: Change [volume] catalog_type default
Start using the 'block-storage' catalog type, which for DevStack has
pointed to the Cinder v3 API for many years now [1].
[1] https://review.opendev.org/c/openstack/devstack/+/565479
Change-Id: I8c9e5bfc2722ccd493c062cbb5e52cbc98f5ddc7
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
diff --git a/releasenotes/notes/change-volume-catalog_type-default-fbcb2be6ebc42818.yaml b/releasenotes/notes/change-volume-catalog_type-default-fbcb2be6ebc42818.yaml
new file mode 100644
index 0000000..053a2f9
--- /dev/null
+++ b/releasenotes/notes/change-volume-catalog_type-default-fbcb2be6ebc42818.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ The default for ``[volume] catalog_type``, which is used to determine the
+ service type to use to idenify the block storage service in the service
+ catalog, has changed from ``volumev3`` to ``block-storage``.
diff --git a/tempest/config.py b/tempest/config.py
index 471782b..bdc1dce 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -978,7 +978,7 @@
help='Timeout in seconds to wait for a volume to become '
'available.'),
cfg.StrOpt('catalog_type',
- default='volumev3',
+ default='block-storage',
help="Catalog type of the Volume Service"),
cfg.StrOpt('region',
default='',
diff --git a/tempest/tests/cmd/test_verify_tempest_config.py b/tempest/tests/cmd/test_verify_tempest_config.py
index fa43e58..3df9f19 100644
--- a/tempest/tests/cmd/test_verify_tempest_config.py
+++ b/tempest/tests/cmd/test_verify_tempest_config.py
@@ -498,7 +498,7 @@
return ('token',
{'serviceCatalog': [{'type': 'compute'},
{'type': 'image'},
- {'type': 'volumev3'},
+ {'type': 'block-storage'},
{'type': 'network'},
{'type': 'object-store'}]})