From: Sage Weil <sage@newdream.net>
Date: Thu, 3 Jun 2021 12:39:30 +0000 (-0500)
Subject: common/options: enable nfs module for new clusters
X-Git-Tag: v16.2.5~87^2~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2185392c1d3075b87b60db9f9fe065a45960983;p=ceph.git

common/options: enable nfs module for new clusters

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 8085a7e9cc6a409c59fc8a1542c3c94607fc4e0b)

# Conflicts:
#	src/common/options/mgr.yaml.in
  - common/options.cc
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 45e546101532..1499f6b756e1 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -5486,7 +5486,7 @@ std::vector<Option> get_global_options() {
     .add_see_also("mgr_module_path"),
 
     Option("mgr_initial_modules", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("restful iostat")
+    .set_default("restful iostat nfs")
     .set_flag(Option::FLAG_NO_MON_UPDATE)
     .set_flag(Option::FLAG_CLUSTER_CREATE)
     .add_service("mon")