mgr/nfs: Don't enable nfs module by default

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 2a99da961adac780ac45dd9e1073d5e695c0c1f5)

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 50354e371f487d43a94668c090b3ef3442a0522e..0be3e89c24c637bbc6feebd5ed9f2e0689519978 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -11,6 +11,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 6381c22091888df2360262e21d9390187cd77964..f2321b2beee4784a064f867f69387cfd68d75515 100644 (file)
--- a/doc/cephfs/fs-nfs-exports.rst
+++ b/doc/cephfs/fs-nfs-exports.rst
@@ -11,6 +11,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 77548965d4e1333252c6e5c0358da3da2b981b88..b7390cc12ab35437c2a489c4c6b8ee82e445db92 100644 (file)
--- 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 d86b9de5d48751e6acb393bb1f1e8fc7ba6c26aa..2ebe49d2dc695aa9808925ab1fb148789614cb36 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1422,6 +1422,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