Merge "config: Change [volume] catalog_type default"

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``.

tempest/config.py

@@ -978,7 +978,7 @@ VolumeGroup = [
                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='',

tempest/tests/cmd/test_verify_tempest_config.py

@@ -498,7 +498,7 @@ class TestDiscovery(base.TestCase):
                 return ('token',
                         {'serviceCatalog': [{'type': 'compute'},
                                             {'type': 'image'},
-                                            {'type': 'volumev3'},
+                                            {'type': 'block-storage'},
                                             {'type': 'network'},
                                             {'type': 'object-store'}]})