diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-04-08 00:32:34 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-04-08 00:32:34 +0000 |
| commit | 4d8594cd7e36983cb55908ab8bfebe8aa3a40ff1 (patch) | |
| tree | 63351604b0d183a7db55a1a58cd47f9c7ffc6b12 /nova/virt | |
| parent | df0e479e204ba5e4c2b01f59a2e7249bd780572e (diff) | |
| parent | b0ad20c796bd25dad0538ab85b1a56f421e16039 (diff) | |
Fixes issues with describe instances due to improperly set metadata.
* Removes image['properties']['type']
* Uses image['container_format'] to key display of type and create ec2 ids.
* Defaults to 'ami' if container_format cannot be deduced. This allows
bare images to show up in describe instances and be launched even though they
are not officially in 'ami' format.
* Changes nova-manage register to set proper container format
* Fixes tests
* Fixes _do_get_kernel_and_ramdisk in openstack api to only try to get them if it is a true 'ami'
* Replaces 'owner_id' with 'project_id' since that is expected by glance code
* Moves the filtering scheme to base image service so all services filter the same way
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt_conn.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 75602f3d0..b949e6c92 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -422,7 +422,6 @@ class LibvirtConnection(driver.ComputeDriver): 'container_format': base['container_format'], 'is_public': False, 'properties': {'architecture': base['architecture'], - 'type': base['type'], 'name': '%s.%s' % (base['name'], image_id), 'kernel_id': instance['kernel_id'], 'image_location': 'snapshot', |