From c39286f93c27bdeba56f1855c8bf59daef338113 Mon Sep 17 00:00:00 2001
From: Alan Bishop <abishop@redhat.com>
Date: Thu, 7 Apr 2022 13:34:01 -0700
Subject: [PATCH] Fix CinderDefaultVolumeType constraints

Fix the CinderDefaultVolumeType constraints so that they match
cinder's own constraints. Basically, volume type names just need
at least one non-whitespace character. The name can contain leading
or trailing whitespace, but it cannot be '' (zero-length) or contain
only whitespace characters. The error message if the constraint isn't
met is similar to cinder's error message.

Resolves: rhbz#2073096
Related-Bug: #1782217
Change-Id: Ie7db672f929b21031338fe3e20ad2dfda34c231f
(cherry picked from commit 52bf7ee056dc1404153dc6b3fb3b0673e946a29d)
(cherry picked from commit ab2d2f82c2575ba0908c4374f592c5f47b5b9533)
(cherry picked from commit 7f12c44846c2bb76afd2dd679f7d5ca3a410bffe)
---
 deployment/cinder/cinder-api-container-puppet.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index afccc9dd63..fd54d67c65 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -59,10 +59,9 @@ parameters:
     description: The name of Cinder's default volume type.
     type: string
     constraints:
-    - allowed_pattern: "[a-zA-Z0-9]+"
+    - allowed_pattern: ".*\\S.*"
       description: >
-        The default volume type must be at least 1 character and contain only
-        letters and numbers.
+        The default volume type name cannot be empty.
   CinderEnableDBPurge:
     default: true
     description: |