diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-06-16 22:17:54 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-06-16 22:17:54 +0900 |
| commit | 7bc76ef403507f6762f782ff4d305cf2718346d5 (patch) | |
| tree | 59987063fd7d46925dc4987da9f8e817dcf1efc9 /nova/api | |
| parent | 8da93c0352996ec733f3678b9ca02b72a96498c2 (diff) | |
ec2/cloud.py: fix mismerge
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index b38061eaf..1bf8bbd35 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1010,7 +1010,8 @@ class CloudController(object): if kwargs.get('ramdisk_id'): ramdisk = self._get_image(context, kwargs['ramdisk_id']) kwargs['ramdisk_id'] = ramdisk['id'] - _parse_block_device_mapping(bdm) + for bdm in kwargs.get('block_device_mapping', []): + _parse_block_device_mapping(bdm) image = self._get_image(context, kwargs['image_id']) |