From 71bc6d15c78a65183bac0e06e1eaec047cf07523 Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Tue, 11 Aug 2020 18:49:01 -0500
Subject: [PATCH] Dynamically determine if ceph is enabled for compute kit

Change-Id: If9af66b0e5e1d6b5ba514c8e5e5f27383e74850e
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
---
 tools/deployment/component/compute-kit/compute-kit.sh | 8 +++++++-
 tools/deployment/component/compute-kit/libvirt.sh     | 9 ++++++++-
 tools/deployment/developer/ceph/160-compute-kit.sh    | 1 -
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tools/deployment/component/compute-kit/compute-kit.sh b/tools/deployment/component/compute-kit/compute-kit.sh
index ec2f14605f..6365e03c25 100755
--- a/tools/deployment/component/compute-kit/compute-kit.sh
+++ b/tools/deployment/component/compute-kit/compute-kit.sh
@@ -13,9 +13,15 @@
 #    under the License.
 set -xe
 
-: ${CEPH_ENABLED:=false}
 : ${RUN_HELM_TESTS:="yes"}
 
+export OS_CLOUD=openstack_helm
+CEPH_ENABLED=false
+if openstack service list -f value -c Type | grep -q "^volume" && \
+    openstack volume type list -f value -c Name | grep -q "rbd"; then
+  CEPH_ENABLED=true
+fi
+
 #NOTE: Get the overrides to use for placement, should placement be deployed.
 case "${OPENSTACK_RELEASE}" in
   "newton")
diff --git a/tools/deployment/component/compute-kit/libvirt.sh b/tools/deployment/component/compute-kit/libvirt.sh
index f8128cabff..874d1a99e9 100755
--- a/tools/deployment/component/compute-kit/libvirt.sh
+++ b/tools/deployment/component/compute-kit/libvirt.sh
@@ -13,6 +13,13 @@
 #    under the License.
 set -xe
 
+export OS_CLOUD=openstack_helm
+CEPH_ENABLED=false
+if openstack service list -f value -c Type | grep -q "^volume" && \
+    openstack volume type list -f value -c Name | grep -q "rbd"; then
+  CEPH_ENABLED=true
+fi
+
 #NOTE: Get the over-rides to use
 export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
 : ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(./tools/deployment/common/get-values-overrides.sh libvirt)"}
@@ -24,7 +31,7 @@ make -C ${HELM_CHART_ROOT_PATH} libvirt
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
   --namespace=openstack \
-  --set conf.ceph.enabled=false \
+  --set conf.ceph.enabled=${CEPH_ENABLED} \
   ${OSH_EXTRA_HELM_ARGS:=} \
   ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
 
diff --git a/tools/deployment/developer/ceph/160-compute-kit.sh b/tools/deployment/developer/ceph/160-compute-kit.sh
index dcfd1fd283..11c3a2281b 100755
--- a/tools/deployment/developer/ceph/160-compute-kit.sh
+++ b/tools/deployment/developer/ceph/160-compute-kit.sh
@@ -14,7 +14,6 @@
 set -xe
 
 export RUN_HELM_TESTS="no"
-export CEPH_ENABLED=true
 export OSH_EXTRA_HELM_ARGS_NOVA="--set manifests.network_policy=true $(./tools/deployment/common/get-values-overrides.sh nova)"
 
 # Deploy nova and neutron charts