mgr/nfs: always create ganesha pool with well-defined name

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

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index e6439110f94a1fc5eace1fd76ffdedc8343f3cfb..e331af08d483d1045595e86d636f2662b241774d 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -58,8 +58,7 @@ class NFSService(CephService):
         from nfs.cluster import create_ganesha_pool
 
         assert self.TYPE == spec.service_type
-        assert spec.pool
-        create_ganesha_pool(self.mgr, spec.pool)
+        create_ganesha_pool(self.mgr)
 
     def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonDeploySpec:
         assert self.TYPE == daemon_spec.daemon_type

diff --git a/src/pybind/mgr/nfs/cluster.py b/src/pybind/mgr/nfs/cluster.py
index ce6b2d63dd78bc8ed72f1d2591ab58e7416fab85..c4f0f1b80f77a355120f771f11bb66c81954e7b7 100644 (file)
--- a/src/pybind/mgr/nfs/cluster.py
+++ b/src/pybind/mgr/nfs/cluster.py
@@ -33,12 +33,12 @@ def resolve_ip(hostname: str) -> str:
         raise NFSInvalidOperation(f"Cannot resolve IP for host {hostname}: {e}")
 
 
-def create_ganesha_pool(mgr: 'MgrModule', pool: str) -> None:
+def create_ganesha_pool(mgr: 'MgrModule') -> None:
     pool_list = [p['pool_name'] for p in mgr.get_osdmap().dump().get('pools', [])]
-    if pool not in pool_list:
-        mgr.check_mon_command({'prefix': 'osd pool create', 'pool': pool})
+    if POOL_NAME not in pool_list:
+        mgr.check_mon_command({'prefix': 'osd pool create', 'pool': POOL_NAME})
         mgr.check_mon_command({'prefix': 'osd pool application enable',
-                               'pool': pool,
+                               'pool': POOL_NAME,
                                'app': 'nfs'})
 
 
@@ -105,7 +105,7 @@ class NFSCluster:
                 raise NFSInvalidOperation(f"cluster id {cluster_id} is invalid. "
                                           f"{invalid_str.group()} is char not permitted")
 
-            create_ganesha_pool(self.mgr, self.pool_name)
+            create_ganesha_pool(self.mgr)
 
             self.create_empty_rados_obj(cluster_id)