From 91516edd2c84e3588b0f36e4e07d9984a0d798e0 Mon Sep 17 00:00:00 2001 From: Belmiro Moreira Date: Thu, 2 May 2013 23:13:52 +0200 Subject: Architecture property updated in snapshot libvirt During an instance snapshot if the architecture property is defined in the image it is updated twice in the snapshot image. The snapshot is created with the metadata values from the "instance_system_metadata" table and then, if defined, the architecure property is updated from the value in the base image in that moment. There is no reason to treat this property differently from others. Also, it didn't respect the "non_inheritable_image_properties" option. This change removes the special behavior for the architecture property in the libvirt driver during a snapshot. Fixes: bug #1176173 Change-Id: Ic5b4e3d462c08df167e14522fa25a7cf857c6aad --- nova/virt/libvirt/driver.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index e8a0a46eb..126a3e0e1 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1117,9 +1117,6 @@ class LibvirtDriver(driver.ComputeDriver): 'ramdisk_id': instance['ramdisk_id'], } } - if 'architecture' in base.get('properties', {}): - arch = base['properties']['architecture'] - metadata['properties']['architecture'] = arch disk_path = libvirt_utils.find_disk(virt_dom) source_format = libvirt_utils.get_disk_type(disk_path) -- cgit