openstack
/
neutron
Code Issues Proposed changes

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
changes/29/22629/1
Aaron Rosen 2013-02-21 14:44:16 -08:00
parent 2852a4b09e
commit 349aa3ef35
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/dhcp_agent.ini
View File

@ -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

3
quantum/agent/dhcp_agent.py
View File

@ -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.")),
]