Merge pull request #148 from stackhpc/upstream/2023.1-2025-04-21

Synchronise 2023.1 with upstream

Author: priteau

nova/conf/cinder.py

@@ -24,7 +24,7 @@
 cinder_opts = [
     cfg.StrOpt('catalog_info',
             default='volumev3::publicURL',
-            regex=r'^\w+:\w*:.*$',
+            regex=r'^[\w-]+:\w*:.*$',
             help="""
 Info to match when looking for cinder in the service catalog.
 

releasenotes/notes/cinder-catalog-info-hyphen-842f02febcfff041.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Nova now allows to use a hyphen in the ``[cinder]catalog_info``
+    service-type field, so in particular the official
+    ``block-storage`` type is now valid.
+    `Bug 2092194 <https://bugs.launchpad.net/nova/+bug/2092194>`_