diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-11 02:39:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-11 02:39:43 +0000 |
| commit | 45e80dfdb2a7ec1ad9bfa38f3761fd9086dcbca8 (patch) | |
| tree | 2ce6ee4df4370097a7c210149d7902c40bbb9797 /nova/api | |
| parent | e40f78b0daa2b78cea1be6262a21029f9cef8de7 (diff) | |
| parent | 0d5fb06b39e8244429be72f05e2066d24572dc2e (diff) | |
Merge "DB migration to the new BDM data format"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index da0a52caa..8f4e20798 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1058,8 +1058,9 @@ class CloudController(object): """Format InstanceBlockDeviceMappingResponseItemType.""" root_device_type = 'instance-store' mapping = [] - for bdm in db.block_device_mapping_get_all_by_instance(context, - instance_uuid): + for bdm in block_device.legacy_mapping( + db.block_device_mapping_get_all_by_instance(context, + instance_uuid)): volume_id = bdm['volume_id'] if (volume_id is None or bdm['no_device']): continue |