x/vmware-nsx
Code Issues Proposed changes

Merge "Quantum dhcp crashes if no networks exist"

Browse Source
This commit is contained in:
Jenkins 2012-09-04 17:52:40 +00:00 committed by Gerrit Code Review
commit 605f400ba4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
quantum/agent/dhcp_agent.py
View File

@ -435,11 +435,15 @@ class DhcpLeaseRelay(object):
def __init__(self, lease_update_callback):
self.callback = lease_update_callback
try:
os.unlink(cfg.CONF.dhcp_lease_relay_socket)
except OSError:
if os.path.exists(cfg.CONF.dhcp_lease_relay_socket):
raise
dirname = os.path.dirname(cfg.CONF.dhcp_lease_relay_socket)
if os.path.isdir(dirname):
try:
os.unlink(cfg.CONF.dhcp_lease_relay_socket)
except OSError:
if os.path.exists(cfg.CONF.dhcp_lease_relay_socket):
raise
else:
os.makedirs(dirname, 0755)
def _validate_field(self, value, regex):
"""Validate value against a regular expression and return if valid."""