]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart: disable dashboard when rbd not built 23336/head
authorNoah Watkins <noahwatkins@gmail.com>
Mon, 30 Jul 2018 21:47:33 +0000 (14:47 -0700)
committerNoah Watkins <noahwatkins@gmail.com>
Mon, 30 Jul 2018 21:50:28 +0000 (14:50 -0700)
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>
src/vstart.sh

index fbb4aecca9daa0cb544e11f387406d71f80a2844..720ad68336f650ceb105fd47f0ab28b82bcfc209 100755 (executable)
@@ -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