diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-05 18:10:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-05 18:10:42 +0000 |
| commit | 4ccc770541ab7263c9181490ee5d3d0602b706ce (patch) | |
| tree | 05b18c4efec50a636a851946a9cb915609d0a9a4 | |
| parent | 800a8704bdde852a6646c970db7433a594c52891 (diff) | |
| parent | 804732d0c5bdc78c20200e7ed51b2f43bb5e936d (diff) | |
Merge "Use bare container format by default"
| -rw-r--r-- | nova/virt/libvirt/driver.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 203789f6f..693590b38 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) |