openstack/devstack
Code Issues Proposed changes

All neutron plugins should now use LibvirtGenericVIFDriver

Browse Source 
Change-Id: I70015ae55fe6db9c6c4663a8d021fe9cfe2eddcf
This commit is contained in:
Aaron Rosen 2013-10-24 13:59:33 -07:00
parent 4b3196f5a7
commit 4540d00ebd
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron
View File

@ -110,6 +110,10 @@ Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}
Q_USE_DEBUG_COMMAND=${Q_USE_DEBUG_COMMAND:-False} Q_USE_DEBUG_COMMAND=${Q_USE_DEBUG_COMMAND:-False}
# The name of the default q-l3 router # The name of the default q-l3 router
Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1} Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1}
# nova vif driver that all plugins should use
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
# List of config file names in addition to the main plugin config file # List of config file names in addition to the main plugin config file
# See _configure_neutron_common() for details about setting it up # See _configure_neutron_common() for details about setting it up
declare -a Q_PLUGIN_EXTRA_CONF_FILES declare -a Q_PLUGIN_EXTRA_CONF_FILES

2
lib/neutron_plugins/bigswitch_floodlight
View File

@ -9,7 +9,7 @@ source $TOP_DIR/lib/neutron_plugins/ovs_base
source $TOP_DIR/lib/neutron_thirdparty/bigswitch_floodlight # for third party service specific configuration values source $TOP_DIR/lib/neutron_thirdparty/bigswitch_floodlight # for third party service specific configuration values
function neutron_plugin_create_nova_conf() { function neutron_plugin_create_nova_conf() {
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"} :
} }
function neutron_plugin_install_agent_packages() { function neutron_plugin_install_agent_packages() {

2
lib/neutron_plugins/linuxbridge_agent
View File

@ -11,7 +11,7 @@ function is_neutron_ovs_base_plugin() {
} }
function neutron_plugin_create_nova_conf() { function neutron_plugin_create_nova_conf() {
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"} :
} }
function neutron_plugin_install_agent_packages() { function neutron_plugin_install_agent_packages() {

1
lib/neutron_plugins/nicira
View File

@ -26,7 +26,6 @@ function is_neutron_ovs_base_plugin() {
} }
function neutron_plugin_create_nova_conf() { function neutron_plugin_create_nova_conf() {
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtOpenVswitchDriver"}
# if n-cpu is enabled, then setup integration bridge # if n-cpu is enabled, then setup integration bridge
if is_service_enabled n-cpu; then if is_service_enabled n-cpu; then
setup_integration_bridge setup_integration_bridge

2
lib/neutron_plugins/ovs_base
View File

@ -73,7 +73,7 @@ function _neutron_ovs_base_configure_l3_agent() {
} }
function _neutron_ovs_base_configure_nova_vif_driver() { function _neutron_ovs_base_configure_nova_vif_driver() {
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"} :
} }
# Restore xtrace # Restore xtrace

3
lib/neutron_plugins/plumgrid
View File

@ -9,8 +9,7 @@ set +o xtrace
#source $TOP_DIR/lib/neutron_plugins/ovs_base #source $TOP_DIR/lib/neutron_plugins/ovs_base
function neutron_plugin_create_nova_conf() { function neutron_plugin_create_nova_conf() {
:
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
} }
function neutron_plugin_setup_interface_driver() { function neutron_plugin_setup_interface_driver() {