]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/volumes: Remove create_rados_pool method
authorVarsha Rao <varao@redhat.com>
Tue, 25 Feb 2020 07:27:44 +0000 (12:57 +0530)
committerVarsha Rao <varao@redhat.com>
Wed, 8 Jul 2020 05:36:34 +0000 (07:36 +0200)
Pool is created by cluster command.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit ae49ab3c789550379138bbd58a3b306dbb046100)

src/pybind/mgr/volumes/fs/nfs.py
src/pybind/mgr/volumes/module.py

index 4ac12d363a090d665c30ac141dea333728f94ad6..c4b4b13a8b3835840cae3a5fc636587f40bacb2a 100644 (file)
@@ -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
index 2a978cf3720f6bc4c839aa521635008722d714f2..6e82348d5ac3b637815ac936dd6ad69e9e1313c1 100644 (file)
@@ -467,7 +467,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)