From 09d6185b3f79f558cf6a42ca3d9b3c7d685dbce7 Mon Sep 17 00:00:00 2001 From: Akihiro MOTOKI Date: Sun, 3 Mar 2013 01:24:45 +0900 Subject: [PATCH] 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 --- lib/quantum_plugins/linuxbridge | 3 ++- lib/quantum_plugins/openvswitch | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/quantum_plugins/linuxbridge b/lib/quantum_plugins/linuxbridge index 6d5d4e08c2..0756de4e9c 100644 --- a/lib/quantum_plugins/linuxbridge +++ b/lib/quantum_plugins/linuxbridge @@ -30,11 +30,12 @@ function quantum_plugin_configure_debug_command() { } function quantum_plugin_configure_dhcp_agent() { - : + iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager quantum.agent.dhcp_agent.DhcpAgentWithStateReport } function quantum_plugin_configure_l3_agent() { iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge + iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport } function quantum_plugin_configure_plugin_agent() { diff --git a/lib/quantum_plugins/openvswitch b/lib/quantum_plugins/openvswitch index 726c6c3ed5..8df12461e9 100644 --- a/lib/quantum_plugins/openvswitch +++ b/lib/quantum_plugins/openvswitch @@ -36,6 +36,7 @@ function quantum_plugin_configure_dhcp_agent() { function quantum_plugin_configure_l3_agent() { _quantum_ovs_base_configure_l3_agent + iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport } function quantum_plugin_configure_plugin_agent() {