diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-09-10 17:11:31 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-09-10 17:11:31 +0900 |
| commit | d8abe79da8dde2667936ee97d88d30d5cf0e6d7f (patch) | |
| tree | 8ac07510f9c8319c0e8615ee1f91bbe83fb243e9 /nova/api | |
| parent | c890890c7ccbc7df1060d59747089b5e39c5510a (diff) | |
| download | nova-d8abe79da8dde2667936ee97d88d30d5cf0e6d7f.tar.gz nova-d8abe79da8dde2667936ee97d88d30d5cf0e6d7f.tar.xz nova-d8abe79da8dde2667936ee97d88d30d5cf0e6d7f.zip | |
api/ec2/ebs: make metadata returns correct swap and ephemeral0
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 50c551f86..0ad2d94f3 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -272,6 +272,12 @@ class CloudController(object): mappings = {} mappings['ami'] = block_device.strip_dev(root_device_name) mappings['root'] = root_device_name + default_local_device = instance_ref.get('default_local_device') + if default_local_device: + mappings['ephemeral0'] = default_local_device + default_swap_device = instance_ref.get('default_swap_device') + if default_swap_device: + mappings['swap'] = default_swap_device ebs_devices = [] # 'ephemeralN', 'swap' and ebs |