summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThuleau Édouard <thuleau@gmail.com>2011-09-02 17:39:37 +0200
committerThuleau Édouard <thuleau@gmail.com>2011-09-02 17:39:37 +0200
commitcae343eecdeba6b3f18dbdc330206edabd9ed287 (patch)
treea27ddec35bf312c374d89adec3df0c7bbb4f2765
parent1b93fdbf13c67bd5b0a5efc1306b95f30c64cc34 (diff)
downloadnova-cae343eecdeba6b3f18dbdc330206edabd9ed287.tar.gz
nova-cae343eecdeba6b3f18dbdc330206edabd9ed287.tar.xz
nova-cae343eecdeba6b3f18dbdc330206edabd9ed287.zip
Update snapshot image metada 'disk_format'.
-rw-r--r--nova/virt/libvirt/connection.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 8e32ac2c4..5f53b9d5d 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -128,7 +128,8 @@ flags.DEFINE_string('qemu_img', 'qemu-img',
'binary to use for qemu-img commands')
flags.DEFINE_string('snapshot_image_format', 'raw',
'Snapshot image format (valide option are : '
- 'all format supported by qemu-img binary')
+ 'raw, qcow2, vmdk, vdi.'
+ 'If the binary qemu_img supports it)')
FLAGS.snapshot_disk_format,
flags.DEFINE_string('libvirt_vif_type', 'bridge',
'Type of VIF to create.')
@@ -424,7 +425,7 @@ class LibvirtConnection(driver.ComputeDriver):
metadata['properties']['architecture'] = arch
if 'disk_format' in base:
- metadata['disk_format'] = base['disk_format']
+ metadata['disk_format'] = FLAGS.snapshot_image_format
if 'container_format' in base:
metadata['container_format'] = base['container_format']