From: Noah Watkins <noahwatkins@gmail.com>
Date: Mon, 30 Jul 2018 21:47:33 +0000 (-0700)
Subject: vstart: disable dashboard when rbd not built
X-Git-Tag: v14.0.1~729^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b9dd4c8a2a468ecfef0fd122fdde8ba66acb41f;p=ceph.git

vstart: disable dashboard when rbd not built

dashboard doesn't load correctly without the rbd module, which means
vstart commands that interact with dashboard fail and vstart exits.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index fbb4aecca9daa..720ad68336f65 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -134,7 +134,8 @@ spdk_enabled=0 #disable SPDK by default
 pci_id=""
 
 with_mgr_dashboard=true
-if [[ "$(get_cmake_variable WITH_MGR_DASHBOARD_FRONTEND)" != "ON" ]]; then
+if [[ "$(get_cmake_variable WITH_MGR_DASHBOARD_FRONTEND)" != "ON" ]] ||
+   [[ "$(get_cmake_variable WITH_RBD)" != "ON" ]]; then
   echo "ceph-mgr dashboard not built - disabling."
   with_mgr_dashboard=false
 fi