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

Signed-off-by: Varsha Rao <varao@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 25ca9c132a4be9b6ac6440d27571967fa37b5872..2e72e541d9800478d69ae7b1771fe084545a8d25 100644 (file)
--- 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 be7fd1958b6c3ec2ff9cc426282df0da35a78f6e..04996b0169be5e8f937ba6ceb44f8ebb1f60d09d 100644 (file)
--- 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 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 7f0dfef731a3bfd001f70ae6a9139e63a486342f..cd3d5f4b6072f6b690ebd6567297cdb6a48ee56c 100755 (executable)
--- 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