From: Sage Weil <sage@newdream.net>
Date: Mon, 28 Jun 2021 18:44:50 +0000 (-0400)
Subject: mgr/nfs: used fixed pool + ns
X-Git-Tag: v17.1.0~1390^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ee6775c3ca96b9f408d4e5977e9d15142b5f1e5;p=ceph.git

mgr/nfs: used fixed pool + ns

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/nfs/cluster.py b/src/pybind/mgr/nfs/cluster.py
index c4f0f1b80f7..4e3c207e2b7 100644
--- a/src/pybind/mgr/nfs/cluster.py
+++ b/src/pybind/mgr/nfs/cluster.py
@@ -44,7 +44,6 @@ def create_ganesha_pool(mgr: 'MgrModule') -> None:
 
 class NFSCluster:
     def __init__(self, mgr: 'Module') -> None:
-        self.pool_name = POOL_NAME
         self.mgr = mgr
 
     def _get_common_conf_obj_name(self, cluster_id: str) -> str:
@@ -58,7 +57,6 @@ class NFSCluster:
             # nfs + ingress
             # run NFS on non-standard port
             spec = NFSServiceSpec(service_type='nfs', service_id=cluster_id,
-                                  pool=self.pool_name, namespace=cluster_id,
                                   placement=PlacementSpec.from_string(placement),
                                   # use non-default port so we don't conflict with ingress
                                   port=12049)
@@ -75,7 +73,6 @@ class NFSCluster:
         else:
             # standalone nfs
             spec = NFSServiceSpec(service_type='nfs', service_id=cluster_id,
-                                  pool=self.pool_name, namespace=cluster_id,
                                   placement=PlacementSpec.from_string(placement))
             completion = self.mgr.apply_nfs(spec)
             orchestrator.raise_if_exception(completion)