]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart.sh: enable nfs module
authorSage Weil <sage@newdream.net>
Wed, 26 May 2021 17:44:04 +0000 (13:44 -0400)
committerSebastian Wagner <sewagner@redhat.com>
Thu, 9 Sep 2021 14:17:45 +0000 (16:17 +0200)
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 9b9c5bc7a4bebec2b03b7ff4367b8964f02614ae)

Conflicts:
src/vstart.sh

src/vstart.sh

index ddb6b2b33e298fecfb23b3dd5e59089d596d493c..974c3ff2c1fc57a2a06d3360e33e9d258f75603a 100755 (executable)
@@ -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