mgr/rook: used fixed pool + ns

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d799f9b5bdf39b2c3226cd160ac5f470951eea67)

Conflicts:
	src/pybind/mgr/rook/rook_cluster.py

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index 4fd660430364179cdd6fc3c4fbb704e87cd744e8..05bd340c6e87c086db151e96b0c00e3da6f466f2 100644 (file)
--- 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)
 
@@ -491,7 +493,7 @@ class RookCluster(object):
                         ),
                     spec=cnfs.Spec(
                         rados=cnfs.Rados(
-                            pool=spec.pool
+                            pool=POOL_NAME,
                             ),
                         server=cnfs.Server(
                             active=count
@@ -499,8 +501,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