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 138767aebefec9fed4ec566bc3327c6d6025ad55..c1943f32773355543acfe29b6a841eba0c2f3fc1 100644 (file)
--- 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",