From: Sage Weil <sage@redhat.com>
Date: Thu, 2 Nov 2017 21:11:26 +0000 (-0500)
Subject: mgr/balancer: enable module by default
X-Git-Tag: v13.0.1~292^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26710f0a9b176289237a52e5fa5894342ad163dc;p=ceph.git

mgr/balancer: enable module by default

It will still be "off".

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

diff --git a/qa/suites/rados/thrash/d-balancer/crush-compat.yaml b/qa/suites/rados/thrash/d-balancer/crush-compat.yaml
index 4206e9a5fabe..aa867660d895 100644
--- a/qa/suites/rados/thrash/d-balancer/crush-compat.yaml
+++ b/qa/suites/rados/thrash/d-balancer/crush-compat.yaml
@@ -1,7 +1,6 @@
 tasks:
 - exec:
     mon.a:
-      - ceph mgr module enable balancer
       - while ! ceph balancer status ; do sleep 1 ; done
       - ceph balancer mode crush-compat
       - ceph balancer on
diff --git a/qa/suites/rados/thrash/d-balancer/upmap.yaml b/qa/suites/rados/thrash/d-balancer/upmap.yaml
index a6382d174c40..417544a52c5d 100644
--- a/qa/suites/rados/thrash/d-balancer/upmap.yaml
+++ b/qa/suites/rados/thrash/d-balancer/upmap.yaml
@@ -1,7 +1,6 @@
 tasks:
 - exec:
     mon.a:
-      - ceph mgr module enable balancer
       - while ! ceph balancer status ; do sleep 1 ; done
       - ceph balancer mode upmap
       - ceph balancer on
diff --git a/src/common/options.cc b/src/common/options.cc
index 89005ae35890..507a9398b3cb 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4177,7 +4177,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")
+    .set_default("restful status balancer")
     .add_service("mon")
     .set_description("List of manager modules to enable when the cluster is "
                      "first started")