From 349aa3ef3563c019f4d0a98fc30117ae0a6cade3 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Thu, 21 Feb 2013 14:44:16 -0800 Subject: [PATCH] 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 --- etc/dhcp_agent.ini | 2 +- quantum/agent/dhcp_agent.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini index fd8d64661..2e9e06e4b 100644 --- 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 fda604cd8..532647b9e 100644 --- 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.")), ]