From 4c4f0b705fb3dbe828b724b2b0e534ee58fd836c Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 2 May 2012 11:47:59 +0200 Subject: Xen has to create it's own tap device if using libvirt and QuantumLinuxBridgeVIFDriver fixes bug 993151 Change-Id: Ibc9c8c7a1e8601d596ace9906c7723f4671029fa --- nova/virt/libvirt/vif.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 8762ff529..80b34220d 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -43,6 +43,7 @@ libvirt_vif_opts = [ FLAGS = flags.FLAGS FLAGS.register_opts(libvirt_vif_opts) +flags.DECLARE('libvirt_type', 'nova.virt.libvirt.connection') class LibvirtBridgeDriver(vif.VIFDriver): @@ -200,7 +201,9 @@ class QuantumLinuxBridgeVIFDriver(vif.VIFDriver): def plug(self, instance, network, mapping): iface_id = mapping['vif_uuid'] dev = self.get_dev_name(iface_id) - linux_net.QuantumLinuxBridgeInterfaceDriver.create_tap_dev(dev) + + if FLAGS.libvirt_type != 'xen': + linux_net.QuantumLinuxBridgeInterfaceDriver.create_tap_dev(dev) conf = config.LibvirtConfigGuestInterface() -- cgit