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

mgr/rook: used fixed pool + ns

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

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index 5d0a9884d390..49742369f7a8 100644
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -51,6 +51,8 @@ except ImportError:
     pass  # just used for type checking.
 
 
+POOL_NAME = 'nfs-ganesha'   # keep in sync with mgr/nfs/nfs_utils.py
+
 T = TypeVar('T')
 FuncT = TypeVar('FuncT', bound=Callable)
 
@@ -502,7 +504,7 @@ class RookCluster(object):
                     spec=cnfs.Spec(
                         rados=cnfs.Rados(
                             namespace=self.rook_env.namespace,
-                            pool=spec.pool
+                            pool=POOL_NAME,
                             ),
                         server=cnfs.Server(
                             active=count
@@ -510,8 +512,7 @@ class RookCluster(object):
                         )
                     )
 
-            if spec.namespace:
-                rook_nfsgw.spec.rados.namespace = spec.namespace
+            rook_nfsgw.spec.rados.namespace = cast(str, spec.service_id)
 
             return rook_nfsgw