mgr/balancer: enable module by default

It will still be "off".

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 26710f0a9b176289237a52e5fa5894342ad163dc)

diff --git a/qa/suites/rados/thrash/d-balancer/crush-compat.yaml b/qa/suites/rados/thrash/d-balancer/crush-compat.yaml
index 4206e9a5fabe2656743c1fb6e6baabf504f4b88a..aa867660d8959f96c1f977144bd875cd62c84ac2 100644 (file)
--- 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 a6382d174c40fa4ea3e7fff85e262efc0398b217..417544a52c5d9587023c88e2db949b1d50c05b2b 100644 (file)
--- 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 71f58a35f1b7d4d606e381bf619139a627ef9081..81ef35803a60ee2ddcd1010eb680604b9144ea72 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4092,7 +4092,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")