Use stevedore aliases for interface_driver configuration

interface_driver configuration was updated to use stevedore aliases.
This patch is to change devstack scripts to now use the aliases
instead of the previous class imports.

Closes-Bug: #1504536

Change-Id: Ic56bfcc1f9da05a999e6fd328e4dd6617e9470ff
This commit is contained in:
Martin Hickey 2015-10-20 12:13:19 +01:00
parent 463a0e6d98
commit dca49de22f
5 changed files with 6 additions and 6 deletions

View File

@ -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
} }

View File

@ -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 {

View File

@ -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

View File

@ -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 {

View File

@ -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 {