openstack
/
neutron
Code Issues Proposed changes

Merge "Increase timeout when waiting for dnsmasq enablement" into stable/stein

This commit is contained in:
Zuul 2019-11-19 14:07:59 +00:00 committed by Gerrit Code Review
parent a026e92634 1bf02756f4
commit 5406960304
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/dhcp.py
View File

@ -215,7 +215,7 @@ class DhcpLocalProcess(DhcpBase):
def enable(self):
"""Enables DHCP for this network by spawning a local process."""
try:
common_utils.wait_until_true(self._enable)
common_utils.wait_until_true(self._enable, timeout=300)
except common_utils.WaitTimeout:
LOG.error("Failed to start DHCP process for network %s",
self.network.id)