diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-30 20:27:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-30 20:27:05 +0000 |
| commit | 75e6f03406de549bec30f6fa58dc1f2035a23ed7 (patch) | |
| tree | af0564b67ef422dade376c6e022eec97b3b3cdb5 | |
| parent | da98bb63d452bcbdecfd5762bdd893b3ffcf70e8 (diff) | |
| parent | 2adf6399b43102b5998f4779e6976b2b5296de6f (diff) | |
| download | nova-75e6f03406de549bec30f6fa58dc1f2035a23ed7.tar.gz nova-75e6f03406de549bec30f6fa58dc1f2035a23ed7.tar.xz nova-75e6f03406de549bec30f6fa58dc1f2035a23ed7.zip | |
Merge "libvirt: use tap for non-blockdevice images on Xen"
| -rw-r--r-- | nova/tests/test_libvirt.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 5a90f3348..72c886529 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -4249,7 +4249,7 @@ class LibvirtUtilsTestCase(test.TestCase): def test_pick_disk_driver_name(self): type_map = {'kvm': ([True, 'qemu'], [False, 'qemu'], [None, 'qemu']), 'qemu': ([True, 'qemu'], [False, 'qemu'], [None, 'qemu']), - 'xen': ([True, 'phy'], [False, 'file'], [None, 'file']), + 'xen': ([True, 'phy'], [False, 'tap'], [None, 'tap']), 'uml': ([True, None], [False, None], [None, None]), 'lxc': ([True, None], [False, None], [None, None])} diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index bd4ec685c..88110055c 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -275,7 +275,7 @@ def pick_disk_driver_name(is_block_dev=False): if is_block_dev: return "phy" else: - return "file" + return "tap" elif CONF.libvirt_type in ('kvm', 'qemu'): return "qemu" else: |