summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-08 18:54:31 +0000
committerGerrit Code Review <review@openstack.org>2012-08-08 18:54:31 +0000
commit96179978f48cfb3607df1bf95e384dbbfeb8620c (patch)
treec5ad1d02798c14ef86005dcdc009387c6fd2d0a7
parent09f39b542e5ea83a3a4a0217966d4767dad97a5c (diff)
parent47589192c598a80f6741b176697aa5cc8261e79a (diff)
Merge "Make libvirt_use_virtio_for_bridges flag works for all drivers."
-rw-r--r--nova/virt/libvirt/vif.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index d45216f85..0337ddc89 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -152,6 +152,8 @@ class LibvirtOpenVswitchDriver(vif.VIFDriver):
conf = config.LibvirtConfigGuestInterface()
+ if FLAGS.libvirt_use_virtio_for_bridges:
+ conf.model = "virtio"
conf.net_type = "ethernet"
conf.target_dev = dev
conf.script = ""
@@ -213,6 +215,8 @@ class QuantumLinuxBridgeVIFDriver(vif.VIFDriver):
conf = config.LibvirtConfigGuestInterface()
+ if FLAGS.libvirt_use_virtio_for_bridges:
+ conf.model = 'virtio'
conf.net_type = "ethernet"
conf.target_dev = dev
conf.script = ""