Browse code
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
Martin Hickey authored on 2015/10/20 20:13:19Showing 5 changed files
- lib/neutron_plugins/bigswitch_floodlight
- lib/neutron_plugins/brocade
- lib/neutron_plugins/cisco
- lib/neutron_plugins/linuxbridge_agent
- lib/neutron_plugins/openvswitch_agent
| ... | ... |
@@ -58,9 +58,9 @@ function neutron_plugin_configure_service {
|
| 58 | 58 |
function neutron_plugin_setup_interface_driver {
|
| 59 | 59 |
local conf_file=$1 |
| 60 | 60 |
if [ "$BS_FL_VIF_DRIVER" = "ivs" ]; then |
| 61 |
- iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.IVSInterfaceDriver |
|
| 61 |
+ iniset $conf_file DEFAULT interface_driver ivs |
|
| 62 | 62 |
else |
| 63 |
- iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver |
|
| 63 |
+ iniset $conf_file DEFAULT interface_driver openvswitch |
|
| 64 | 64 |
fi |
| 65 | 65 |
} |
| 66 | 66 |
|
| ... | ... |
@@ -68,7 +68,7 @@ function neutron_plugin_configure_plugin_agent {
|
| 68 | 68 |
|
| 69 | 69 |
function neutron_plugin_setup_interface_driver {
|
| 70 | 70 |
local conf_file=$1 |
| 71 |
- iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver |
|
| 71 |
+ iniset $conf_file DEFAULT interface_driver linuxbridge |
|
| 72 | 72 |
} |
| 73 | 73 |
|
| 74 | 74 |
function has_neutron_plugin_security_group {
|
| ... | ... |
@@ -150,7 +150,7 @@ function neutron_plugin_create_initial_network_profile {
|
| 150 | 150 |
|
| 151 | 151 |
function neutron_plugin_setup_interface_driver {
|
| 152 | 152 |
local conf_file=$1 |
| 153 |
- iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver |
|
| 153 |
+ iniset $conf_file DEFAULT interface_driver openvswitch |
|
| 154 | 154 |
} |
| 155 | 155 |
|
| 156 | 156 |
# Restore xtrace |
| ... | ... |
@@ -85,7 +85,7 @@ function neutron_plugin_configure_plugin_agent {
|
| 85 | 85 |
|
| 86 | 86 |
function neutron_plugin_setup_interface_driver {
|
| 87 | 87 |
local conf_file=$1 |
| 88 |
- iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver |
|
| 88 |
+ iniset $conf_file DEFAULT interface_driver linuxbridge |
|
| 89 | 89 |
} |
| 90 | 90 |
|
| 91 | 91 |
function neutron_plugin_check_adv_test_requirements {
|
| ... | ... |
@@ -110,7 +110,7 @@ function neutron_plugin_configure_plugin_agent {
|
| 110 | 110 |
|
| 111 | 111 |
function neutron_plugin_setup_interface_driver {
|
| 112 | 112 |
local conf_file=$1 |
| 113 |
- iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver |
|
| 113 |
+ iniset $conf_file DEFAULT interface_driver openvswitch |
|
| 114 | 114 |
} |
| 115 | 115 |
|
| 116 | 116 |
function neutron_plugin_check_adv_test_requirements {
|