From: Sage Weil <sage@newdream.net>
Date: Wed, 5 May 2021 16:34:56 +0000 (-0400)
Subject: mgr/nfs: factor out ganesha pool creation
X-Git-Tag: v17.1.0~1854^2~19
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5585fdd5e384ca816a34d7918ccebc02b66d6abc;p=ceph.git

mgr/nfs: factor out ganesha pool creation

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 da52d79b64846..d7da069cd7bb6 100644
--- a/src/pybind/mgr/nfs/cluster.py
+++ b/src/pybind/mgr/nfs/cluster.py
@@ -22,6 +22,15 @@ def cluster_setter(func):
     return set_pool_ns_clusterid
 
 
+def create_ganesha_pool(mgr, pool):
+    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})
+        mgr.check_mon_command({'prefix': 'osd pool application enable',
+                               'pool': pool,
+                               'app': 'nfs'})
+
+
 class NFSCluster:
     def __init__(self, mgr):
         self.pool_name = POOL_NAME
@@ -65,12 +74,7 @@ class NFSCluster:
                 raise NFSInvalidOperation(f"cluster id {cluster_id} is invalid. "
                                           f"{invalid_str.group()} is char not permitted")
 
-            pool_list = [p['pool_name'] for p in self.mgr.get_osdmap().dump().get('pools', [])]
-
-            if self.pool_name not in pool_list:
-                self.mgr.check_mon_command({'prefix': 'osd pool create', 'pool': self.pool_name})
-                self.mgr.check_mon_command({'prefix': 'osd pool application enable',
-                                            'pool': self.pool_name, 'app': 'nfs'})
+            create_ganesha_pool(self.mgr, self.pool_name)
 
             self.create_empty_rados_obj()