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

This commit is contained in:
Zuul 2019-11-14 05:09:53 +00:00 committed by Gerrit Code Review
commit 926173c30e
1 changed files with 1 additions and 1 deletions

View File

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