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:
parent
463a0e6d98
commit
dca49de22f
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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 {
|
||||||
|
@ -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
|
||||||
|
@ -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 {
|
||||||
|
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user