From a5c45a87afc570a179bac26c100a4817719080ba Mon Sep 17 00:00:00 2001
From: Rajat Dhasmana <rajatdhasmana@gmail.com>
Date: Wed, 20 May 2026 08:44:11 +0000
Subject: [PATCH] Cinder: Update default of catalog info

The default value for ``cinder_catalog_info`` is currently
``volumev3::publicURL`` which works but doesn't reflect the
official service type for Cinder i.e. ``block-storage``.

This patch changes the default to ``block-storage:cinder:publicURL``
as ``block-storage`` is the official service type[1], ``cinder``
is the official service name and ``publicURL`` is the default
interface. Both ``public`` and ``publicURL`` are acceptable values[2].

[1] https://service-types.openstack.org/service-types.json
[2] https://github.com/openstack/keystoneauth/blob/92dade5b56767908b62cf516667b93278c59dd84/keystoneauth1/access/service_catalog.py#L493

Change-Id: I4df4b568ddb139632be511b145b7dc2104249672
Signed-off-by: Rajat Dhasmana <rajatdhasmana@gmail.com>
---

diff --git a/glance_store/_drivers/cinder/store.py b/glance_store/_drivers/cinder/store.py
index 86eaad1..4d3869a 100644
--- a/glance_store/_drivers/cinder/store.py
+++ b/glance_store/_drivers/cinder/store.py
@@ -62,7 +62,7 @@
 
 _CINDER_OPTS = [
     cfg.StrOpt('cinder_catalog_info',
-               default='volumev3::publicURL',
+               default='block-storage:cinder:publicURL',
                help="""
 Information to match when looking for cinder in the service catalog.
 
diff --git a/releasenotes/notes/cinder-catalog-default-8679f91b74828d2c.yaml b/releasenotes/notes/cinder-catalog-default-8679f91b74828d2c.yaml
new file mode 100644
index 0000000..ba853d8
--- /dev/null
+++ b/releasenotes/notes/cinder-catalog-default-8679f91b74828d2c.yaml
@@ -0,0 +1,14 @@
+---
+upgrade:
+  - |
+    Cinder: Changed default value of ``cinder_catalog_info``
+    from ``volumev3::publicURL`` to ``block-storage:cinder:publicURL``
+    as the official service name and service type for cinder
+    is ``cinder`` and ``block-storage`` respectively.
+deprecations:
+  - |
+    Cinder: Deprecated the default value of ``cinder_catalog_info``
+    which was ``volumev3::publicURL``.
+    The new default ``block-storage:cinder:publicURL`` is set
+    as the official service name and service type for cinder
+    is ``cinder`` and ``block-storage`` respectively.