From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Jun 2018 14:01:34 +0000 (-0500)
Subject: mgr: enable devicehealth by default
X-Git-Tag: v14.0.1~1030^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9f51a1e537480d7e7d1bfbb7bcf43bed1a05c7ea;p=ceph.git

mgr: enable devicehealth by default

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index f370707cb51b3..fe74a73a148c9 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4771,7 +4771,7 @@ std::vector<Option> get_global_options() {
     .set_description("Filesystem path to manager modules."),
 
     Option("mgr_initial_modules", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("restful status balancer iostat")
+    .set_default("restful status balancer iostat devicehealth")
     .set_flag(Option::FLAG_NO_MON_UPDATE)
     .set_flag(Option::FLAG_CLUSTER_CREATE)
     .add_service("mon")
diff --git a/src/vstart.sh b/src/vstart.sh
index 9b4af13d86cb7..7dd94a9569221 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -434,7 +434,7 @@ prepare_conf() {
         heartbeat file = $CEPH_OUT_DIR/\$name.heartbeat
 "
 
-    local mgr_modules="restful status balancer iostat"
+    local mgr_modules="restful status balancer iostat devicehealth"
     if $with_mgr_dashboard; then
       mgr_modules="dashboard $mgr_modules"
     fi