From: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date: Sat, 2 Mar 2013 10:45:16 +0000 (+0900)
Subject: Change the default l3_agent_manager to L3NATAgent
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aeec6f12833c1edb5d302aae56f7eb9445d8d8bd;p=openstack-build%2Fneutron-build.git

Change the default l3_agent_manager to L3NATAgent

This is a l3-agent version of 349aa3ef3563c019f4d0a98fc30117ae0a6cade3.

The combination of the plugin without agent extension support
and L3NATAgentWithStateReport results in an error:
"AttributeError: No such RPC function 'report_state'".

This patch changes l3_agent_manager to be L3NATAgent instead of
L3NATAgentWithStateReport since all plugins do not support
L3NATAgentWithStateReport and having this as the default breaks
all current deployments that upgrade source without changing
their config files.

Fixes bug 1139726

Change-Id: Ibb5c04c89bfad741ec43a372cbf97445f7b3d76c
---

diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini
index 133576c3f..c08fa37cb 100644
--- a/etc/l3_agent.ini
+++ b/etc/l3_agent.ini
@@ -2,6 +2,9 @@
 # Show debugging output in log (sets DEBUG log level output)
 # debug = True
 
+# The Quantum L3 Agent manager
+# l3_agent_manager = quantum.agent.l3_agent.L3NATAgent
+
 # L3 requires that an interface driver be set.  Choose the one that best
 # matches your plugin.
 
diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py
index c67ebe6a1..bfaa1c415 100644
--- a/quantum/agent/l3_agent.py
+++ b/quantum/agent/l3_agent.py
@@ -144,7 +144,7 @@ class L3NATAgent(manager.Manager):
                    help=_("UUID of external network for routers implemented "
                           "by the agents.")),
         cfg.StrOpt('l3_agent_manager',
-                   default='quantum.agent.l3_agent.L3NATAgentWithStateReport',
+                   default='quantum.agent.l3_agent.L3NATAgent',
                    help=_("The Quantum L3 Agent manager.")),
     ]