diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-06-03 10:23:38 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-06-03 10:23:38 -0400 |
| commit | b45d07ded9db7c92e03cea1427413d4dda95d869 (patch) | |
| tree | e0168130b1614efbc164bde3d1bda82ec5f9c7a9 | |
| parent | 0fd5e0ca8b2d6f9c081b9c31cca7e4ad27d5141c (diff) | |
| download | nova-b45d07ded9db7c92e03cea1427413d4dda95d869.tar.gz nova-b45d07ded9db7c92e03cea1427413d4dda95d869.tar.xz nova-b45d07ded9db7c92e03cea1427413d4dda95d869.zip | |
Make libvirt snapshotting work with images that don't have an 'architecture' property.
| -rw-r--r-- | nova/virt/libvirt/connection.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index c491418ae..98cdff311 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -403,8 +403,7 @@ class LibvirtConnection(driver.ComputeDriver): 'is_public': False, 'status': 'active', 'name': snapshot['name'], - 'properties': {'architecture': - base['properties']['architecture'], + 'properties': { 'kernel_id': instance['kernel_id'], 'image_location': 'snapshot', 'image_state': 'available', @@ -412,6 +411,9 @@ class LibvirtConnection(driver.ComputeDriver): 'ramdisk_id': instance['ramdisk_id'], } } + if 'architecture' in base['properties']: + arch = base['properties']['architecture'] + metadata['properties']['architecture'] = arch # Make the snapshot snapshot_name = uuid.uuid4().hex |