Browse Source

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

changes/61/694561/1
Zuul Gerrit Code Review 4 months ago
parent
commit
926173c30e
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      neutron/agent/linux/dhcp.py

+ 1
- 1
neutron/agent/linux/dhcp.py View File

@@ -216,7 +216,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)


Loading…
Cancel
Save