From: Sam Lang <sam.lang@inktank.com>
Date: Fri, 1 Feb 2013 14:20:43 +0000 (-0600)
Subject: misc: Fix get_wwn_id_map() to be optional
X-Git-Tag: 1.1.0~2339
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ac4ba69d8ded4b1e102058ebbac5fe10616eb5b8;p=teuthology.git

misc: Fix get_wwn_id_map() to be optional

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>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 024bf051f1..c5303a93d0 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -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 = {}