Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nova/conf/cinder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
@@ -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>`_