commit e095daa73267cedbd3cc7b68f517bbe0624f770e
author Joe Gordon <joe.gordon0@gmail.com> Thu Aug 29 15:45:20 2013 -0400
committer Joe Gordon <joe.gordon0@gmail.com> Tue Oct 22 09:52:27 2013 +0100
tree 835e0b748b4e54a2ffe74a476928ac6d7cf8516e
parent ff38d464e41db3d8f83c2b85b48f983e424f3a23

Make nova use fatal_deprecations=true

We should not be using deprecated config options here, so lets set
fatal_deprecations=True to make sure.

Stop using deprecated LibvirtHybridOVSBridgeDriver

Change-Id: I0a43780270d092a42ede6c0667343f0d02b3aa67

lib/neutron_plugins/ovs_base

diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index 2666d8e..1214f3b 100644
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -73,13 +73,7 @@
 }
 
 function _neutron_ovs_base_configure_nova_vif_driver() {
-    # The hybrid VIF driver needs to be specified when Neutron Security Group
-    # is enabled (until vif_security attributes are supported in VIF extension)
-    if [[ "$Q_USE_SECGROUP" == "True" ]]; then
-        NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver"}
-    else
-        NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
-    fi
+    NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
 }
 
 # Restore xtrace