@@ -73,13 +73,7 @@ function _neutron_ovs_base_configure_l3_agent() {

 }

 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

@@ -377,6 +377,7 @@ function create_nova_conf() {

     iniset $NOVA_CONF DEFAULT ec2_workers "4"

     iniset $NOVA_CONF DEFAULT metadata_workers "4"

     iniset $NOVA_CONF DEFAULT sql_connection `database_connection_url nova`

+    iniset $NOVA_CONF DEFAULT fatal_deprecations "True"

     iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"

     iniset $NOVA_CONF osapi_v3 enabled "True"