From: Sage Weil <sage@newdream.net>
Date: Wed, 26 May 2021 17:44:04 +0000 (-0400)
Subject: vstart.sh: enable nfs module
X-Git-Tag: v16.2.7~116^2~122
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8fbb9565512bf3572abbad8771685ff763dc19a0;p=ceph.git

vstart.sh: enable nfs module

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

Conflicts:
	src/vstart.sh
---

diff --git a/src/vstart.sh b/src/vstart.sh
index ddb6b2b33e2..974c3ff2c1f 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -572,7 +572,7 @@ prepare_conf() {
         heartbeat file = $CEPH_OUT_DIR/\$name.heartbeat
 "
 
-    local mgr_modules="restful iostat"
+    local mgr_modules="restful iostat nfs"
     if $with_mgr_dashboard; then
         mgr_modules="dashboard $mgr_modules"
     fi
@@ -1422,7 +1422,6 @@ fi
 # Ganesha Daemons
 if [ $GANESHA_DAEMON_NUM -gt 0 ]; then
     pseudo_path="/cephfs"
-    ceph_adm mgr module enable nfs
     if [ "$cephadm" -gt 0 ]; then
         cluster_id="vstart"
         prun ceph_adm nfs cluster create $cluster_id