Merge pull request ceph#23129 from alfredodeza/wip-rm24952

ceph-volume lvm.listing only include devices if they exist Reviewed-by: Andrew Schoen <[email protected]>
blmt · Jul 19, 2018 · 12f1ffe · 12f1ffe
2 parents fa4c030 + 37565f8
commit 12f1ffe
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/ceph-volume/ceph_volume/devices/lvm/listing.py b/src/ceph-volume/ceph_volume/devices/lvm/listing.py
@@ -49,8 +49,15 @@ def pretty_report(report):
                         value=value
                     )
                 )
-            output.append(
-                device_metadata_item_template.format(tag_name='devices', value=','.join(device['devices'])))
+            if not device.get('devices'):
+                continue
+            else:
+                output.append(
+                    device_metadata_item_template.format(
+                        tag_name='devices',
+                        value=','.join(device['devices'])
+                    )
+                )
 
     print(''.join(output))