openstack/devstack
Code Issues Proposed changes

Merge "Remove stale config l3|dhcp_agent_manager options"

Browse Source
This commit is contained in:
Jenkins 2016-08-17 14:02:44 +00:00 committed by Gerrit Code Review
commit f1d8278356
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/neutron_plugins/linuxbridge_agent
View File

@ -44,7 +44,7 @@ function neutron_plugin_configure_debug_command {
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
local conf_file=$1 local conf_file=$1
iniset $conf_file DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport :
} }
function neutron_plugin_configure_l3_agent { function neutron_plugin_configure_l3_agent {
@ -52,7 +52,6 @@ function neutron_plugin_configure_l3_agent {
sudo brctl addbr $PUBLIC_BRIDGE sudo brctl addbr $PUBLIC_BRIDGE
set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU
iniset $conf_file DEFAULT external_network_bridge iniset $conf_file DEFAULT external_network_bridge
iniset $conf_file DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
} }
function neutron_plugin_configure_plugin_agent { function neutron_plugin_configure_plugin_agent {

3
lib/neutron_plugins/openvswitch_agent
View File

@ -29,13 +29,12 @@ function neutron_plugin_configure_debug_command {
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
local conf_file=$1 local conf_file=$1
iniset $conf_file DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport :
} }
function neutron_plugin_configure_l3_agent { function neutron_plugin_configure_l3_agent {
local conf_file=$1 local conf_file=$1
_neutron_ovs_base_configure_l3_agent _neutron_ovs_base_configure_l3_agent
iniset $conf_file DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
} }
function neutron_plugin_configure_plugin_agent { function neutron_plugin_configure_plugin_agent {