From 2a99da961adac780ac45dd9e1073d5e695c0c1f5 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Mon, 19 Apr 2021 15:41:22 +0530 Subject: [PATCH] mgr/nfs: Don't enable nfs module by default Signed-off-by: Varsha Rao --- PendingReleaseNotes | 3 +++ doc/cephfs/fs-nfs-exports.rst | 2 ++ qa/tasks/cephfs/test_nfs.py | 1 + src/vstart.sh | 1 + 4 files changed, 7 insertions(+) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 25ca9c132a4be..2e72e541d9800 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -14,6 +14,9 @@ >=16.0.0 -------- +* mgr/nfs: ``nfs`` module is moved out of volumes plugin. Prior using the + ``ceph nfs`` commands, ``nfs`` mgr module must be enabled. + * volumes/nfs: The ``cephfs`` cluster type has been removed from the ``nfs cluster create`` subcommand. Clusters deployed by cephadm can support an NFS export of both ``rgw`` and ``cephfs`` from a single diff --git a/doc/cephfs/fs-nfs-exports.rst b/doc/cephfs/fs-nfs-exports.rst index be7fd1958b6c3..04996b0169be5 100644 --- a/doc/cephfs/fs-nfs-exports.rst +++ b/doc/cephfs/fs-nfs-exports.rst @@ -14,6 +14,8 @@ Requirements - ``nfs-ganesha``, ``nfs-ganesha-ceph``, ``nfs-ganesha-rados-grace`` and ``nfs-ganesha-rados-urls`` packages (version 3.3 and above) +.. note:: From Pacific, the nfs mgr module must be enabled prior to use. + Create NFS Ganesha Cluster ========================== diff --git a/qa/tasks/cephfs/test_nfs.py b/qa/tasks/cephfs/test_nfs.py index 77548965d4e13..b7390cc12ab35 100644 --- a/qa/tasks/cephfs/test_nfs.py +++ b/qa/tasks/cephfs/test_nfs.py @@ -31,6 +31,7 @@ class TestNFS(MgrTestCase): def setUp(self): super(TestNFS, self).setUp() + self._load_module('nfs') self.cluster_id = "test" self.export_type = "cephfs" self.pseudo_path = "/cephfs" diff --git a/src/vstart.sh b/src/vstart.sh index 7f0dfef731a3b..cd3d5f4b6072f 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -1426,6 +1426,7 @@ 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 -- 2.39.5