From 606b0519043120084dc30e4cc9936fa94fdb0926 Mon Sep 17 00:00:00 2001 From: Joseph Sawaya Date: Tue, 3 Aug 2021 13:31:08 -0400 Subject: [PATCH] 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 --- src/pybind/mgr/rook/module.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py index fb9b8355cef97..028e801c224b5 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: -- 2.39.5