From: Varsha Rao <varao@redhat.com>
Date: Tue, 25 Feb 2020 07:27:44 +0000 (+0530)
Subject: mgr/volumes: Remove create_rados_pool method
X-Git-Tag: v16.1.0~2626^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae49ab3c789550379138bbd58a3b306dbb046100;p=ceph.git

mgr/volumes: Remove create_rados_pool method

Pool is created by cluster command.

Signed-off-by: Varsha Rao <varao@redhat.com>
---

diff --git a/src/pybind/mgr/volumes/fs/nfs.py b/src/pybind/mgr/volumes/fs/nfs.py
index 4ac12d363a09..c4b4b13a8b38 100644
--- a/src/pybind/mgr/volumes/fs/nfs.py
+++ b/src/pybind/mgr/volumes/fs/nfs.py
@@ -260,22 +260,6 @@ class NFSConfig(object):
         #return 0, json.dumps(fsmap_res, indent=2), ""
         return fsmap_res
 
-    def create_rados_pool(self, vc_mgr, pool_name):
-        if not NFSConfig.exp_num:
-            r, outb, outs = create_pool(vc_mgr, pool_name)
-
-        """
-        if r != 0:
-        #return r, outb, outs
-
-        command = {'prefix': 'osd pool application enable', 'pool': pool_name, 'app': 'nfs'}
-        r, outb, outs = vc_mgr.mgr.mon_command(command)
-
-        if r != 0:
-        #return r, outb, outs
-        log.info("pool enable done r: {}".format(r))
-        """
-
     def create_nfs_cluster(self, size):
         pool_list = [p['pool_name'] for p in self.mgr.get_osdmap().dump().get('pools', [])]
         client = 'client.%s' % self.cluster_id
diff --git a/src/pybind/mgr/volumes/module.py b/src/pybind/mgr/volumes/module.py
index 60a567f1da5e..39c7c0169306 100644
--- a/src/pybind/mgr/volumes/module.py
+++ b/src/pybind/mgr/volumes/module.py
@@ -404,7 +404,6 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
     def _cmd_fs_nfs_export_create(self, inbuf, cmd):
         if NFSConfig.check_fsal_valid(self, self.vc.mgr.get('fs_map')):
             pool_name = "nfs-ganesha"
-            #NFSConfig.create_rados_pool(self.vc.mgr, pool_name)
             #instance = NFSConfig.create_instance(self, pool_name)
             return NFSConfig.create_export(instance)