From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 24 Oct 2017 18:51:02 +0000 (-0700)
Subject: qa: use fs rm_data_pool
X-Git-Tag: v12.2.13~234^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82d95c4afbeebd4550db9c68e25d631ad2224ad6;p=ceph.git

qa: use fs rm_data_pool

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b897ef9445e31004595df4d6243ac8333691c116)

 Conflicts:
	doc/cephfs/administration.rst
	qa/workunits/cephtool/test.sh
	qa/workunits/fs/misc/mkpool_layout_vxattrs.sh
    Changes were dropped.
---

diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index 138767aebef..c1943f32773 100644
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -747,7 +747,7 @@ class CephFSVolumeClient(object):
             pool_id = self._get_pool_id(osd_map, pool_name)
             mds_map = self.get_mds_map()
             if pool_id in mds_map['data_pools']:
-                self._rados_command("fs {} remove_data_pool".format(mds_map['fs_name']), {
+                self._rados_command("fs {} rm_data_pool".format(mds_map['fs_name']), {
                     'pool': pool_name
                 })
             self._rados_command("osd pool delete",