]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph-volume util.disk when there are no devices mapped, skip to the next one
authorAlfredo Deza <adeza@redhat.com>
Tue, 2 Oct 2018 15:18:44 +0000 (11:18 -0400)
committerAlfredo Deza <adeza@redhat.com>
Tue, 2 Oct 2018 15:18:44 +0000 (11:18 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
src/ceph-volume/ceph_volume/util/disk.py

index 423ffe25e49cb664ba6312f4404601a45b159c65..3c5f4abecf46a8ac825869158c3911a45e03bb2d 100644 (file)
@@ -686,6 +686,8 @@ def get_devices(_sys_block_path='/sys/block', _dev_path='/dev', _mapper_path='/d
         # Ensure that the diskname is an absolute path and that it never points
         # to a /dev/dm-* device
         diskname = mapper_devs.get(block) or dev_devs.get(block)
+        if not diskname:
+            continue
 
         # If the mapper device is a logical volume it gets excluded
         if is_mapper_device(diskname):