]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: fix raw list
authorSébastien Han <seb@redhat.com>
Fri, 24 Jan 2020 16:25:42 +0000 (17:25 +0100)
committerJan Fajerski <jfajerski@suse.com>
Fri, 28 Feb 2020 15:38:37 +0000 (16:38 +0100)
There is no json anymore, just plain output.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit e99eb8cc95c5f50ec13170f202226c3581e3f5e2)

src/ceph-volume/ceph_volume/devices/raw/list.py

index 5e8202a7897dc225d953b2dc305b780e2fc444c3..b04f55cd8da0abbe7c006e556feab1055a32b23b 100644 (file)
@@ -34,9 +34,7 @@ class List(object):
                 'lsblk', '--paths', '--nodeps', '--output=NAME', '--noheadings'
             ])
             assert not ret
-            r = json.loads(''.join(out))
-            for dev in r.get('blockdevices', []):
-                devs.append('/dev/' + dev['name'])
+            devs = out
         result = {}
         for dev in devs:
             logger.debug('Examining %s' % dev)