]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
misc: Fix get_wwn_id_map() to be optional
authorSam Lang <sam.lang@inktank.com>
Fri, 1 Feb 2013 14:20:43 +0000 (08:20 -0600)
committerSam Lang <sam.lang@inktank.com>
Fri, 1 Feb 2013 14:20:43 +0000 (08:20 -0600)
Not all plana nodes have symlinks setup when
we check /dev/disk/by-id/wwn-*.  Instead of failing
here, just use the /dev/disk/sd* devices.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
teuthology/misc.py

index 024bf051f15f18e5ff181700d169735dae5e4f5d..c5303a93d0dd4ed6a928d8403b2ecd3ae85061c4 100644 (file)
@@ -362,7 +362,8 @@ def get_wwn_id_map(remote, devs):
             )
         stdout = r.stdout.getvalue()
     except:
-        return None
+        log.error('Failed to get wwn devices! Using /dev/sd* devices...')
+        return devs
 
     devmap = {}