Merge "Change cinder bootstrap script"

openstack-helm/centos/build_srpm.data

@@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
 
 COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
 
-TIS_PATCH_VER=20
+TIS_PATCH_VER=21

openstack-helm/centos/openstack-helm.spec

@@ -38,6 +38,7 @@ Patch16: 0016-Cinder-rename-is_ceph_volume-configured.patch
 Patch17: 0017-Cinder-support-multiple-ceph-volume-backends.patch
 Patch18: 0018-Nova-add-service-token.patch
 Patch19: 0019-Add-TLS-support-for-Aodh-and-Panko-public-endpoints.patch
+Patch20: 0020-Change-cinder-bootstrap-script.patch
 
 BuildRequires: helm
 BuildRequires: openstack-helm-infra
@@ -67,6 +68,7 @@ Openstack Helm charts
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 # initialize helm and build the toolkit

openstack-helm/files/0020-Change-cinder-bootstrap-script.patch

@@ -0,0 +1,31 @@
+From 7de7cf2f14a58255d85149d08577dd63662aa6d9 Mon Sep 17 00:00:00 2001
+From: Teresa Ho <teresa.ho@windriver.com>
+Date: Mon, 15 Jul 2019 10:30:58 -0400
+Subject: [PATCH] Change cinder bootstrap script
+
+This commit changes the cinder template bootstrap script
+to use the openstack client instead of the cinder client
+to list volume types.
+
+Change-Id: I5a4b22ab4475d503b3e8fa46cd3c56a0b40863e0
+Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
+---
+ cinder/templates/bin/_bootstrap.sh.tpl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cinder/templates/bin/_bootstrap.sh.tpl b/cinder/templates/bin/_bootstrap.sh.tpl
+index 6592d19..bd60fd8 100644
+--- a/cinder/templates/bin/_bootstrap.sh.tpl
++++ b/cinder/templates/bin/_bootstrap.sh.tpl
+@@ -48,7 +48,7 @@ openstack volume type show {{ $name }} || \
+   {{- end }}
+ 
+ {{- /* Check volume type and properties were added */}}
+-cinder extra-specs-list
++openstack volume type list --long
+ 
+ {{- end }}
+ 
+-- 
+1.8.3.1
+