doc/mgr/nfs: update nfs links

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

Conflicts:
	.github/labeler.yml
	doc/releases/pacific.rst

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 5719e113f1564df8bf438c088ae0a4e8cf7759a6..e8b46b960061b51983c5d1eab874ec394eeefdcc 100644 (file)
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -225,3 +225,16 @@ tests:
   - qa/tasks/**
   - qa/workunits/**
   - src/test/**
+
+nfs:
+  - src/pybind/mgr/nfs/**
+  - src/pybind/mgr/cephadm/services/nfs.py
+  - src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
+  - src/pybind/mgr/dashboard/services/ganesha.py
+  - src/pybind/mgr/dashboard/tests/test_ganesha.py
+  - qa/tasks/cephfs/test_nfs.py
+  - qa/tasks/mgr/dashboard/test_ganesha.py
+  - doc/mgr/nfs.rst
+  - doc/cephfs/nfs.rst
+  - doc/cephadm/nfs.rst
+  - doc/radosgw/nfs.rst

diff --git a/doc/cephadm/nfs.rst b/doc/cephadm/nfs.rst
index 631fe51bd0b71ba67222435648993994729613f5..a9ade73d54ad16c9a803b8950c0d7c39430f4465 100644 (file)
--- a/doc/cephadm/nfs.rst
+++ b/doc/cephadm/nfs.rst
@@ -7,7 +7,7 @@ NFS Service
 .. note:: Only the NFSv4 protocol is supported.
 
 The simplest way to manage NFS is via the ``ceph nfs cluster ...``
-commands; see :ref:`cephfs-nfs`.  This document covers how to manage the
+commands; see :ref:`mgr-nfs`.  This document covers how to manage the
 cephadm services directly, which should only be necessary for unusual NFS
 configurations.
 

diff --git a/doc/cephfs/index.rst b/doc/cephfs/index.rst
index 02ae3e9b2934696a0d88872e89f9f0b122e9c920..1726b2f5f74b541ae8ffbb39a025efd6829f4fee 100644 (file)
--- a/doc/cephfs/index.rst
+++ b/doc/cephfs/index.rst
@@ -84,7 +84,6 @@ Administration
     MDS Configuration Settings <mds-config-ref>
     Manual: ceph-mds <../../man/8/ceph-mds>
     Export over NFS <nfs>
-    Export over NFS with volume nfs interface <fs-nfs-exports>
     Application best practices <app-best-practices>
     FS volume and subvolumes <fs-volumes>
     CephFS Quotas <quota>

diff --git a/doc/mgr/index.rst b/doc/mgr/index.rst
index 0b03acfb9385a156e37bd9f415dab0332cf91f8a..50754a5e2b54c40ef7fbf5fdf5724e4fd8a9e88c 100644 (file)
--- a/doc/mgr/index.rst
+++ b/doc/mgr/index.rst
@@ -46,3 +46,4 @@ sensible.
     Orchestrator module <orchestrator>
     Rook module <rook>
     MDS Autoscaler module <mds_autoscaler>
+    NFS module <nfs>

diff --git a/doc/mgr/nfs.rst b/doc/mgr/nfs.rst
index 14a4c6d1b134c96c9f74fcc33fc506fcad28f007..9b827c47f9bca78d61d17a9d7983fb598b788db0 100644 (file)
--- a/doc/mgr/nfs.rst
+++ b/doc/mgr/nfs.rst
@@ -1,4 +1,4 @@
-.. _cephfs-nfs:
+.. _mgr-nfs:
 
 =======================
 CephFS Exports over NFS