Support newstyple rbd commangd output stable-2.6-ippool-hotplug-esi
authorDimitris Aragiorgis <dimara@grnet.gr>
Fri, 30 Nov 2012 20:39:36 +0000 (22:39 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Fri, 30 Nov 2012 20:39:36 +0000 (22:39 +0200)
This patch is taken from ganeti mailing list: http://goo.gl/LgukY

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

lib/bdev.py

index 7b330bc..3f7ce0d 100644 (file)
@@ -2513,14 +2513,12 @@ class RADOSBlockDevice(BlockDev):
     volumefield = 2
     devicefield = 4
 
-    field_sep = "\t"
-
     lines = output.splitlines()
-    splitted_lines = map(lambda l: l.split(field_sep), lines)
+    splitted_lines = map(lambda l: l.split(), lines)
 
     # Check empty output.
     if not splitted_lines:
-      _ThrowError("rbd showmapped returned empty output")
+      return None
 
     # Check showmapped header line, to determine number of fields.
     field_cnt = len(splitted_lines[0])