Browse code
Cleanup unused settings, use interface_driver setter
* Remove unused MIDONET specific settings from nova.conf
* Remove unused MIDONET specific settings from dhcp_agent.ini
* Move the interface_driver settings to the proper setting
function so that it can be used by lbaas_agent.ini as well.
Change-Id: Id686ff5f55db00bce42b8a2bd56e7655c73211fb
Closes-Bug: #1245401
(cherry picked from commit e4a523f543e59d92ab227b5bcfaad09fc171b6a9)
Joe Mills authored on 2013/10/28 16:38:55Showing 1 changed files
| ... | ... |
@@ -32,9 +32,8 @@ function neutron_plugin_configure_debug_command() {
|
| 32 | 32 |
|
| 33 | 33 |
function neutron_plugin_configure_dhcp_agent() {
|
| 34 | 34 |
DHCP_DRIVER=${DHCP_DRIVER:-"neutron.plugins.midonet.agent.midonet_driver.DhcpNoOpDriver"}
|
| 35 |
- DHCP_INTERFACE_DRIVER=${DHCP_INTEFACE_DRIVER:-"neutron.plugins.midonet.agent.midonet_driver.MidonetInterfaceDriver"}
|
|
| 35 |
+ neutron_plugin_setup_interface_driver $Q_DHCP_CONF_FILE |
|
| 36 | 36 |
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_driver $DHCP_DRIVER |
| 37 |
- iniset $Q_DHCP_CONF_FILE DEFAULT interface_driver $DHCP_INTERFACE_DRIVER |
|
| 38 | 37 |
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces True |
| 39 | 38 |
iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True |
| 40 | 39 |
} |
| ... | ... |
@@ -66,8 +65,8 @@ function neutron_plugin_configure_service() {
|
| 66 | 66 |
} |
| 67 | 67 |
|
| 68 | 68 |
function neutron_plugin_setup_interface_driver() {
|
| 69 |
- # May change in the future |
|
| 70 |
- : |
|
| 69 |
+ local conf_file=$1 |
|
| 70 |
+ iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.MidonetInterfaceDriver |
|
| 71 | 71 |
} |
| 72 | 72 |
|
| 73 | 73 |
function has_neutron_plugin_security_group() {
|