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 1d81d2c413c169be5525556d4d1b02c2c247f5a9..1f75ed434a5258b364fe812c55f01577a71d8a78 100644 (file)
--- 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 d06cf708f17b1e6c760dfae096ca3fe2d49816f2..97d17bbbdd436f5b7c3a19e6c9397b9d2e566b68 100755 (executable)
--- 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