[stable/2023.2] [CLOUDOPS-344] fix: bump cinder chart and add bootstra… (#1823)
This is an automated cherry-pick of #1807
/assign ricolin
diff --git a/charts/cinder/templates/bin/_bootstrap.sh.tpl b/charts/cinder/templates/bin/_bootstrap.sh.tpl
index 49d99c5..9d117c8 100644
--- a/charts/cinder/templates/bin/_bootstrap.sh.tpl
+++ b/charts/cinder/templates/bin/_bootstrap.sh.tpl
@@ -38,6 +38,11 @@
openstack volume type show {{ $name }} || \
openstack volume type create \
--{{ $access_type }} \
+ {{- range $key, $value := $properties }}
+ {{- if or (eq $key "encryption-provider") (eq $key "encryption-cipher") (eq $key "encryption-key-size") (eq $key "encryption-control-location") }}
+ --{{ $key }} {{ $value}} \
+ {{- end }}
+ {{- end }}
{{ $name }}
{{/*
We will try to set or update volume type properties.
@@ -64,7 +69,7 @@
{{- end }}
{{- range $key, $value := $properties }}
- {{- if and (ne $key "access_type") (ne $key "grant_access") $value }}
+ {{- if and (ne $key "access_type") (ne $key "grant_access") (ne $key "encryption-provider") (ne $key "encryption-cipher") (ne $key "encryption-key-size") (ne $key "encryption-control-location") $value }}
openstack volume type set --property {{ $key }}={{ $value }} {{ $name }}
{{- end }}
{{- end }}
diff --git a/charts/patches/cinder/0002-fix-fix-volume-type-create-to-honor-encrypt-type.patch b/charts/patches/cinder/0002-fix-fix-volume-type-create-to-honor-encrypt-type.patch
new file mode 100644
index 0000000..cd4025d
--- /dev/null
+++ b/charts/patches/cinder/0002-fix-fix-volume-type-create-to-honor-encrypt-type.patch
@@ -0,0 +1,25 @@
+diff --git a/cinder/templates/bin/_bootstrap.sh.tpl b/cinder/templates/bin/_bootstrap.sh.tpl
+index 49d99c52..9d117c84 100644
+--- a/cinder/templates/bin/_bootstrap.sh.tpl
++++ b/cinder/templates/bin/_bootstrap.sh.tpl
+@@ -38,6 +38,11 @@ export HOME=/tmp
+ openstack volume type show {{ $name }} || \
+ openstack volume type create \
+ --{{ $access_type }} \
++ {{- range $key, $value := $properties }}
++ {{- if or (eq $key "encryption-provider") (eq $key "encryption-cipher") (eq $key "encryption-key-size") (eq $key "encryption-control-location") }}
++ --{{ $key }} {{ $value}} \
++ {{- end }}
++ {{- end }}
+ {{ $name }}
+ {{/*
+ We will try to set or update volume type properties.
+@@ -64,7 +69,7 @@ export HOME=/tmp
+ {{- end }}
+
+ {{- range $key, $value := $properties }}
+- {{- if and (ne $key "access_type") (ne $key "grant_access") $value }}
++ {{- if and (ne $key "access_type") (ne $key "grant_access") (ne $key "encryption-provider") (ne $key "encryption-cipher") (ne $key "encryption-key-size") (ne $key "encryption-control-location") $value }}
+ openstack volume type set --property {{ $key }}={{ $value }} {{ $name }}
+ {{- end }}
+ {{- end }}