Make snapshots with qemu-img instead of libvirt
* snapshot is only supposed to snapshot the root drive, whereas libvirt snapshots snapshot the memory and all attached disks * removes silly qemu_img flag * fixes bug 946830 Change-Id: I6afc9dbaa855f06864cd5a37f89ad63555e35d23
This commit is contained in:
@@ -179,6 +179,10 @@ filterlist = [
|
|||||||
# nova/virt/xenapi/vm_utils.py: 'mkfs'
|
# nova/virt/xenapi/vm_utils.py: 'mkfs'
|
||||||
filters.CommandFilter("/sbin/mkfs", "root"),
|
filters.CommandFilter("/sbin/mkfs", "root"),
|
||||||
|
|
||||||
|
# nova/virt/libvirt/utils.py: 'qemu-img'
|
||||||
|
filters.CommandFilter("/usr/bin/qemu-img", "root"),
|
||||||
|
|
||||||
# nova/virt/libvirt/connection.py:
|
# nova/virt/libvirt/connection.py:
|
||||||
filters.ReadFileFilter("/etc/iscsi/initiatorname.iscsi"),
|
filters.ReadFileFilter("/etc/iscsi/initiatorname.iscsi"),
|
||||||
|
|
||||||
]
|
]
|
||||||
|
@@ -61,6 +61,14 @@ def chown(path, owner):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def create_snapshot(disk_path, snapshot_name):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def delete_snapshot(disk_path, snapshot_name):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def extract_snapshot(disk_path, source_fmt, snapshot_name, out_path, dest_fmt):
|
def extract_snapshot(disk_path, source_fmt, snapshot_name, out_path, dest_fmt):
|
||||||
files[out_path] = ''
|
files[out_path] = ''
|
||||||
|
|
||||||
|
@@ -96,8 +96,14 @@ class FakeVirtDomain(object):
|
|||||||
def name(self):
|
def name(self):
|
||||||
return "fake-domain %s" % self
|
return "fake-domain %s" % self
|
||||||
|
|
||||||
def snapshotCreateXML(self, *args):
|
def info(self):
|
||||||
return FakeVirDomainSnapshot(self)
|
return [power_state.RUNNING, None, None, None, None]
|
||||||
|
|
||||||
|
def create(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def managedSave(self, *args):
|
||||||
|
pass
|
||||||
|
|
||||||
def createWithFlags(self, launch_flags):
|
def createWithFlags(self, launch_flags):
|
||||||
pass
|
pass
|
||||||
|
Reference in New Issue
Block a user