diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index af74e75b8..3807ff323 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1303,8 +1303,10 @@ class CloudController(object): properties = image['properties'] root_device_name = block_device.properties_root_device_name(properties) root_device_type = 'instance-store' + for bdm in properties.get('block_device_mapping', []): - if (bdm.get('device_name') == root_device_name and + if (block_device.strip_dev(bdm.get('device_name')) == + block_device.strip_dev(root_device_name) and ('snapshot_id' in bdm or 'volume_id' in bdm) and not bdm.get('no_device')): root_device_type = 'ebs' |