From 0afa508f068fa308daadf0be8c4ae23e95e7ac58 Mon Sep 17 00:00:00 2001
From: jh629g <jh629g@att.com>
Date: Wed, 17 Apr 2019 09:00:43 -0500
Subject: [PATCH] Fix results of openstack volume type list --default

Currently openstack volume type list --default
returns 404 if the openstack environment is
deployed using openstack-helm. The value
default_volume_type was previously unimplemented
in values.yaml for cinder.

Change-Id: Ifb6d54d875d5cbaffc8330d15d999ef830010177
---
 cinder/values.yaml                          | 1 +
 tools/deployment/component/cinder/cinder.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cinder/values.yaml b/cinder/values.yaml
index 778600779d..5538c71fe5 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -784,6 +784,7 @@ conf:
       # via the endpoints section.
       osapi_volume_listen_port: null
       enabled_backends: "rbd1"
+      default_volume_type: "rbd1"
       # NOTE(portdirect): "cinder.backup.drivers.ceph"  and
       # "cinder.backup.drivers.posix" also supported
       backup_driver: "cinder.backup.drivers.swift"
diff --git a/tools/deployment/component/cinder/cinder.sh b/tools/deployment/component/cinder/cinder.sh
index b66e6d6530..492cc7fc4c 100755
--- a/tools/deployment/component/cinder/cinder.sh
+++ b/tools/deployment/component/cinder/cinder.sh
@@ -47,3 +47,4 @@ export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack volume type list
+openstack volume type list --default