From 804732d0c5bdc78c20200e7ed51b2f43bb5e936d Mon Sep 17 00:00:00 2001 From: Boris Filippov Date: Wed, 5 Sep 2012 05:40:05 +0400 Subject: Use bare container format by default Set container_format to bare during libvirt snapshot, when VM image in glance was deleted. Currently, if VM image in glance was already deleted before snapshot, nova will attempt to create snapshot image with container_format: None. This cause glance to return error on attempt to upload snapshot. According to glance docs container_format is not used anywhere in glance or nova explicitly and it is safe to set it to bare, when you are unsure which container_format you need to use. Current snapshot logic sets snapshot disk_format to currently used image_format in absence of base image in glance. This resolves bug 921774 without need for snapshot mechanism redesign. Change-Id: I7beea35120aaeac0837daecdf58f38f62e24454c --- nova/virt/libvirt/driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index c9326e71b..6f4139f6c 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -784,8 +784,7 @@ class LibvirtDriver(driver.ComputeDriver): else: metadata['disk_format'] = image_format - if 'container_format' in base: - metadata['container_format'] = base['container_format'] + metadata['container_format'] = base.get('container_format', 'bare') # Find the disk xml_desc = virt_dom.XMLDesc(0) -- cgit