]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume-client: fix command argument order 20643/head
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 27 Feb 2018 11:35:00 +0000 (03:35 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 28 Feb 2018 11:55:52 +0000 (03:55 -0800)
Fixes: http://tracker.ceph.com/issues/22038
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/pybind/ceph_volume_client.py

index 9e4a2a21682dfdc84a322a532cfbe70f67192a78..fb71bcd58171bea2ff47338608fa149177ebfb59 100644 (file)
@@ -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",