diff --git a/nova/virt/block_device.py b/nova/virt/block_device.py index 339b353da844..ed1c40e388d1 100644 --- a/nova/virt/block_device.py +++ b/nova/virt/block_device.py @@ -360,17 +360,14 @@ class DriverBlankBlockDevice(DriverVolumeBlockDevice): def _convert_block_devices(device_type, block_device_mapping): - def _is_transformable(bdm): + devices = [] + for bdm in block_device_mapping: try: - device_type(bdm) + devices.append(device_type(bdm)) except _NotTransformable: - return False - return True - - return [device_type(bdm) - for bdm in block_device_mapping - if _is_transformable(bdm)] + pass + return devices convert_swap = functools.partial(_convert_block_devices, DriverSwapBlockDevice)