From 2ac3efc8a4493b91d613e2f81841f77ef2241e18 Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Thu, 19 Dec 2024 13:42:52 +0100 Subject: [PATCH] Allow hyphen in cinder catalog_info service-type The official service type for Cinder according to [0] is "block-storage", so it should be allowed in the validation regex. [0] https://specs.openstack.org/openstack/service-types-authority/ Closes-Bug: 2092194 Change-Id: I9a57aa72cc9589cec08b0f8d5797108043747ef6 (cherry picked from commit 2c8400043d9c5b088815a48f20aef99d58f1488d) (cherry picked from commit 137097dc939ea9f9a70021415d557292bb078948) (cherry picked from commit acc46c5871e7163e7ca45e032fde41134509af23) (cherry picked from commit b2ceff2e895437c59270b0a2eb72f8b1bf39d41e) --- nova/conf/cinder.py | 2 +- .../notes/cinder-catalog-info-hyphen-842f02febcfff041.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/cinder-catalog-info-hyphen-842f02febcfff041.yaml diff --git a/nova/conf/cinder.py b/nova/conf/cinder.py index 71ce48ff90e..5d2c9e02d51 100644 --- a/nova/conf/cinder.py +++ b/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. diff --git a/releasenotes/notes/cinder-catalog-info-hyphen-842f02febcfff041.yaml b/releasenotes/notes/cinder-catalog-info-hyphen-842f02febcfff041.yaml new file mode 100644 index 00000000000..bee8c307741 --- /dev/null +++ b/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 `_