diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-02 19:51:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-02 19:51:53 +0000 |
| commit | 1d97b77ea4c31f1fb17bc20cc4c16a3f6edf2cf1 (patch) | |
| tree | 5092c72dd329737964d02654ce853be49585e962 | |
| parent | 96b358dc41568851f3c1fa54111b4eecbc004ef0 (diff) | |
| parent | 4c4f0b705fb3dbe828b724b2b0e534ee58fd836c (diff) | |
| download | nova-1d97b77ea4c31f1fb17bc20cc4c16a3f6edf2cf1.tar.gz nova-1d97b77ea4c31f1fb17bc20cc4c16a3f6edf2cf1.tar.xz nova-1d97b77ea4c31f1fb17bc20cc4c16a3f6edf2cf1.zip | |
Merge "Xen has to create it's own tap device if using libvirt and QuantumLinuxBridgeVIFDriver"
| -rw-r--r-- | nova/virt/libvirt/vif.py | 5 |
1 files changed, 4 insertions, 1 deletions
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() |