From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 27 Feb 2018 11:35:00 +0000 (-0800)
Subject: ceph-volume-client: fix command argument order
X-Git-Tag: wip-pdonnell-testing-20180317.202121~167^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cd30d28c6e691c974d6a10b4441d03febfec544f;p=ceph-ci.git

ceph-volume-client: fix command argument order

Fixes: http://tracker.ceph.com/issues/22038

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index 9e4a2a21682..fb71bcd5817 100644
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -627,7 +627,8 @@ class CephFSVolumeClient(object):
             pool_id = self._create_volume_pool(pool_name)
             mds_map = self.get_mds_map()
             if pool_id not in mds_map['data_pools']:
-                self._rados_command("fs {} add_data_pool".format(mds_map['fs_name']), {
+                self._rados_command("fs add_data_pool", {
+                    'fs_name': mds_map['fs_name'],
                     'pool': pool_name
                 })
             self.fs.setxattr(path, 'ceph.dir.layout.pool', pool_name, 0)
@@ -727,7 +728,8 @@ 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 {} rm_data_pool".format(mds_map['fs_name']), {
+                self._rados_command("fs rm_data_pool", {
+                    'fs_name': mds_map['fs_name'],
                     'pool': pool_name
                 })
             self._rados_command("osd pool delete",