From: Joseph Sawaya <jsawaya@redhat.com>
Date: Tue, 3 Aug 2021 17:31:08 +0000 (-0400)
Subject: mgr/rook: prevent creation of NFS clusters not in .nfs rados pool
X-Git-Tag: v17.1.0~459^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=606b0519043120084dc30e4cc9936fa94fdb0926;p=ceph.git

mgr/rook: prevent creation of NFS clusters not in .nfs rados pool

This commit prevents the creation of NFS clusters that don't use the
.nfs RADOS pool using ceph orch apply nfs.

Signed-off-by: Joseph Sawaya <jsawaya@redhat.com>
---

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index fb9b8355cef..028e801c224 100644
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -33,7 +33,7 @@ except ImportError:
     client = None
     config = None
 
-from mgr_module import MgrModule, Option
+from mgr_module import MgrModule, Option, NFS_POOL_NAME
 import orchestrator
 from orchestrator import handle_orch_error, OrchResult, raise_if_exception
 
@@ -349,6 +349,8 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
             # CephNFSes
             all_nfs = self.rook_cluster.get_resource("cephnfses")
             for nfs in all_nfs:
+                if nfs['spec']['rados']['pool'] != NFS_POOL_NAME:
+                    continue
                 nfs_name = nfs['metadata']['name']
                 svc = 'nfs.' + nfs_name
                 if svc in spec: