From: Sébastien Han <seb@redhat.com>
Date: Fri, 24 Jan 2020 16:25:42 +0000 (+0100)
Subject: ceph-volume: fix raw list
X-Git-Tag: v14.2.8~102^2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a1b38922ed4e1f7bf692e6b4e94d20800137bf0;p=ceph.git

ceph-volume: fix raw list

There is no json anymore, just plain output.

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

diff --git a/src/ceph-volume/ceph_volume/devices/raw/list.py b/src/ceph-volume/ceph_volume/devices/raw/list.py
index 5d610c7a024..f72c135ed89 100644
--- a/src/ceph-volume/ceph_volume/devices/raw/list.py
+++ b/src/ceph-volume/ceph_volume/devices/raw/list.py
@@ -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)