From: Mohamad Gebai <mgebai@suse.com>
Date: Tue, 22 May 2018 03:43:30 +0000 (-0400)
Subject: mgr/iostat: enable module by default on new and vstart clusters
X-Git-Tag: v13.2.0~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22235%2Fhead;p=ceph.git

mgr/iostat: enable module by default on new and vstart clusters

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit a776755b704065bb0b3dc648b3c5e1efd887e003)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 1d81d2c413c..1f75ed434a5 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4719,7 +4719,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")
+    .set_default("restful status balancer iostat")
     .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 d06cf708f17..97d17bbbdd4 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"
+    local mgr_modules="restful status balancer iostat"
     if $with_mgr_dashboard; then
       mgr_modules="dashboard $mgr_modules"
     fi