openstack/devstack
Code Issues Proposed changes

Merge "Use stevedore aliases for interface_driver configuration"

Browse Source
This commit is contained in:
Jenkins 2015-11-03 15:13:25 +00:00 committed by Gerrit Code Review
commit 22c9023494
5 changed files with 6 additions and 6 deletions

4
lib/neutron_plugins/bigswitch_floodlight

@ -58,9 +58,9 @@ function neutron_plugin_configure_service {
function neutron_plugin_setup_interface_driver { function neutron_plugin_setup_interface_driver {
local conf_file=$1 local conf_file=$1
if [ "$BS_FL_VIF_DRIVER" = "ivs" ]; then if [ "$BS_FL_VIF_DRIVER" = "ivs" ]; then
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.IVSInterfaceDriver iniset $conf_file DEFAULT interface_driver ivs
else else
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver iniset $conf_file DEFAULT interface_driver openvswitch
fi fi
} }

2
lib/neutron_plugins/brocade

@ -68,7 +68,7 @@ function neutron_plugin_configure_plugin_agent {
function neutron_plugin_setup_interface_driver { function neutron_plugin_setup_interface_driver {
local conf_file=$1 local conf_file=$1
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver iniset $conf_file DEFAULT interface_driver linuxbridge
} }
function has_neutron_plugin_security_group { function has_neutron_plugin_security_group {

2
lib/neutron_plugins/cisco

@ -150,7 +150,7 @@ function neutron_plugin_create_initial_network_profile {
function neutron_plugin_setup_interface_driver { function neutron_plugin_setup_interface_driver {
local conf_file=$1 local conf_file=$1
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver iniset $conf_file DEFAULT interface_driver openvswitch
} }
# Restore xtrace # Restore xtrace

2
lib/neutron_plugins/linuxbridge_agent

@ -85,7 +85,7 @@ function neutron_plugin_configure_plugin_agent {
function neutron_plugin_setup_interface_driver { function neutron_plugin_setup_interface_driver {
local conf_file=$1 local conf_file=$1
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver iniset $conf_file DEFAULT interface_driver linuxbridge
} }
function neutron_plugin_check_adv_test_requirements { function neutron_plugin_check_adv_test_requirements {

2
lib/neutron_plugins/openvswitch_agent

@ -110,7 +110,7 @@ function neutron_plugin_configure_plugin_agent {
function neutron_plugin_setup_interface_driver { function neutron_plugin_setup_interface_driver {
local conf_file=$1 local conf_file=$1
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver iniset $conf_file DEFAULT interface_driver openvswitch
} }
function neutron_plugin_check_adv_test_requirements { function neutron_plugin_check_adv_test_requirements {