Browse code
All neutron plugins should now use LibvirtGenericVIFDriver
Change-Id: I70015ae55fe6db9c6c4663a8d021fe9cfe2eddcf
Aaron Rosen authored on 2013/10/25 05:59:33Showing 6 changed files
- lib/neutron
- lib/neutron_plugins/bigswitch_floodlight
- lib/neutron_plugins/linuxbridge_agent
- lib/neutron_plugins/nicira
- lib/neutron_plugins/ovs_base
- lib/neutron_plugins/plumgrid
| ... | ... |
@@ -110,6 +110,10 @@ Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}
|
| 110 | 110 |
Q_USE_DEBUG_COMMAND=${Q_USE_DEBUG_COMMAND:-False}
|
| 111 | 111 |
# The name of the default q-l3 router |
| 112 | 112 |
Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1}
|
| 113 |
+# nova vif driver that all plugins should use |
|
| 114 |
+NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 115 |
+ |
|
| 116 |
+ |
|
| 113 | 117 |
# List of config file names in addition to the main plugin config file |
| 114 | 118 |
# See _configure_neutron_common() for details about setting it up |
| 115 | 119 |
declare -a Q_PLUGIN_EXTRA_CONF_FILES |
| ... | ... |
@@ -9,7 +9,7 @@ source $TOP_DIR/lib/neutron_plugins/ovs_base |
| 9 | 9 |
source $TOP_DIR/lib/neutron_thirdparty/bigswitch_floodlight # for third party service specific configuration values |
| 10 | 10 |
|
| 11 | 11 |
function neutron_plugin_create_nova_conf() {
|
| 12 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 12 |
+ : |
|
| 13 | 13 |
} |
| 14 | 14 |
|
| 15 | 15 |
function neutron_plugin_install_agent_packages() {
|
| ... | ... |
@@ -26,7 +26,6 @@ function is_neutron_ovs_base_plugin() {
|
| 26 | 26 |
} |
| 27 | 27 |
|
| 28 | 28 |
function neutron_plugin_create_nova_conf() {
|
| 29 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtOpenVswitchDriver"}
|
|
| 30 | 29 |
# if n-cpu is enabled, then setup integration bridge |
| 31 | 30 |
if is_service_enabled n-cpu; then |
| 32 | 31 |
setup_integration_bridge |
| ... | ... |
@@ -9,8 +9,7 @@ set +o xtrace |
| 9 | 9 |
#source $TOP_DIR/lib/neutron_plugins/ovs_base |
| 10 | 10 |
|
| 11 | 11 |
function neutron_plugin_create_nova_conf() {
|
| 12 |
- |
|
| 13 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 12 |
+ : |
|
| 14 | 13 |
} |
| 15 | 14 |
|
| 16 | 15 |
function neutron_plugin_setup_interface_driver() {
|