1. devstack
  2. Commit f1d82783568a1e5f52b2011e60c0a4000ca43d3c
Browse code

Merge "Remove stale config l3|dhcp_agent_manager options"

Jenkins authored on 2016/08/17 23:02:44
Showing 2 changed files
lib/neutron_plugins/linuxbridge_agent
History View file @ f1d8278
... ... 
@@ -44,7 +44,7 @@ function neutron_plugin_configure_debug_command {
44 44
45 45 
 function neutron_plugin_configure_dhcp_agent {
46 46 
     local conf_file=$1
47 
-    iniset $conf_file DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
47 
+    :
48 48 
 }
49 49
50 50 
 function neutron_plugin_configure_l3_agent {
... ... 
@@ -52,7 +52,6 @@ function neutron_plugin_configure_l3_agent {
52 52 
     sudo brctl addbr $PUBLIC_BRIDGE
53 53 
     set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU
54 54 
     iniset $conf_file DEFAULT external_network_bridge
55 
-    iniset $conf_file DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
56 55 
 }
57 56
58 57 
 function neutron_plugin_configure_plugin_agent {
lib/neutron_plugins/openvswitch_agent
History View file @ f1d8278
... ... 
@@ -29,13 +29,12 @@ function neutron_plugin_configure_debug_command {
29 29
30 30 
 function neutron_plugin_configure_dhcp_agent {
31 31 
     local conf_file=$1
32 
-    iniset $conf_file DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
32 
+    :
33 33 
 }
34 34
35 35 
 function neutron_plugin_configure_l3_agent {
36 36 
     local conf_file=$1
37 37 
     _neutron_ovs_base_configure_l3_agent
38 
-    iniset $conf_file DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
39 38 
 }
40 39
41 40 
 function neutron_plugin_configure_plugin_agent {