From 56c27e6be813e6a8b972733468eb099596ff7381 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 2 Nov 2017 16:11:26 -0500
Subject: [PATCH] mgr/balancer: enable module by default

It will still be "off".

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 26710f0a9b176289237a52e5fa5894342ad163dc)
---
 qa/suites/rados/thrash/d-balancer/crush-compat.yaml | 1 -
 qa/suites/rados/thrash/d-balancer/upmap.yaml        | 1 -
 src/common/options.cc                               | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/qa/suites/rados/thrash/d-balancer/crush-compat.yaml b/qa/suites/rados/thrash/d-balancer/crush-compat.yaml
index 4206e9a5fabe2..aa867660d8959 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 a6382d174c40f..417544a52c5d9 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 71f58a35f1b7d..81ef35803a60e 100644
--- 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")
-- 
2.39.5