1. devstack
  2. Commit 09d6185b3f79f558cf6a42ca3d9b3c7d685dbce7
Browse code

Set l3_agent_manager for ovs/linuxbridge plugin

related to quantum bug 1139726, L3NATAgentWithStateReport makes
no longer the default, as doing so broke DHCP for other plugins.

Quantum linuxbridge has the agent extension support. This commit also
set dhcp/l3_agent_manager to *AgentWithStateReport in linuxbridge plugin.

Change-Id: I4095f4276499468d02265169cc26bbd8489679bc

Akihiro MOTOKI authored on 2013/03/03 01:24:45
Showing 2 changed files
lib/quantum_plugins/linuxbridge
History View file @ 09d6185
... ... 
@@ -30,11 +30,12 @@ function quantum_plugin_configure_debug_command() {
30 30 
 }
31 31
32 32 
 function quantum_plugin_configure_dhcp_agent() {
33 
-    :
33 
+    iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager quantum.agent.dhcp_agent.DhcpAgentWithStateReport
34 34 
 }
35 35
36 36 
 function quantum_plugin_configure_l3_agent() {
37 37 
     iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge
38 
+    iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport
38 39 
 }
39 40
40 41 
 function quantum_plugin_configure_plugin_agent() {
lib/quantum_plugins/openvswitch
History View file @ 09d6185
... ... 
@@ -36,6 +36,7 @@ function quantum_plugin_configure_dhcp_agent() {
36 36
37 37 
 function quantum_plugin_configure_l3_agent() {
38 38 
     _quantum_ovs_base_configure_l3_agent
39 
+    iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport
39 40 
 }
40 41
41 42 
 function quantum_plugin_configure_plugin_agent() {