diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-03 22:38:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-03 22:38:34 +0000 |
| commit | 4726e3d8e1f6700dd19f5ec72a249d5c2dfb1efd (patch) | |
| tree | 69e79633ba11c54be8aa1370bd958ce9d9342100 /nova/virt | |
| parent | c1478783866ff3d3807e0d0407b0906581042662 (diff) | |
| parent | ee2b37877d555bbd02d28606de1bb54d284698c1 (diff) | |
Merge "Do not fail to build a snapshot if base image is not found"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/connection.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index ac286a768..5d27c6f5a 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -592,7 +592,11 @@ class LibvirtConnection(driver.ComputeDriver): (image_service, image_id) = nova.image.get_image_service( context, instance['image_ref']) - base = image_service.show(context, image_id) + try: + base = image_service.show(context, image_id) + except exception.ImageNotFound: + base = {} + _image_service = nova.image.get_image_service(context, image_href) snapshot_image_service, snapshot_image_id = _image_service snapshot = snapshot_image_service.show(context, snapshot_image_id) @@ -608,7 +612,7 @@ class LibvirtConnection(driver.ComputeDriver): 'ramdisk_id': instance['ramdisk_id'], } } - if 'architecture' in base['properties']: + if 'architecture' in base.get('properties', {}): arch = base['properties']['architecture'] metadata['properties']['architecture'] = arch |