AttributeError: No such RPC function 'report_state'

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

Fixes bug 1131446

Change-Id: I6415f85714b03e9bf59d597e8ec2397fedc92b02

diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index fd8d646610c8a2960963ba8ae18961c9fc9de6a3..2e9e06e4b1927af2e7977addde3c56262ae153ea 100644 (file)
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -46,4 +46,4 @@ dhcp_driver = quantum.agent.linux.dhcp.Dnsmasq
 # enable_metadata_network = False
 
 # The Quantum DHCP agent manager.
-# dhcp_agent_manager = quantum.agent.dhcp_agent.DhcpAgentWithStateReport
+# dhcp_agent_manager = quantum.agent.dhcp_agent.DhcpAgent

diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index fda604cd866fbd57c5412781db5986a6ec6b2efb..532647b9e3fa93f46df4819269b641c6709dff1f 100644 (file)
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -66,8 +66,7 @@ class DhcpAgent(manager.Manager):
                            "dedicate network. Requires "
                            "enable isolated_metadata = True ")),
         cfg.StrOpt('dhcp_agent_manager',
-                   default='quantum.agent.dhcp_agent.'
-                   'DhcpAgentWithStateReport',
+                   default='quantum.agent.dhcp_agent.DhcpAgent',
                    help=_("The Quantum DHCP agent manager.")),
     ]