openstack
/
neutron
Code Issues Proposed changes

Merge "Default dnsmasq --conf-file to /dev/null" into stable/victoria

This commit is contained in:
Zuul 2020-10-10 20:06:25 +00:00 committed by Gerrit Code Review
parent 69355990bc 1da19b3c9e
commit af4e518a5e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,7 +462,8 @@ class Dnsmasq(DhcpLocalProcess):
cmd.append('--dhcp-option-force=option:T2,%ds' %
self.conf.dhcp_rebinding_time)
cmd.append('--conf-file=%s' % self.conf.dnsmasq_config_file)
cmd.append('--conf-file=%s' %
(self.conf.dnsmasq_config_file.strip() or '/dev/null'))
for server in self.conf.dnsmasq_dns_servers:
cmd.append('--server=%s' % server)

17
neutron/tests/unit/agent/linux/test_dhcp.py
View File

@ -1287,6 +1287,21 @@ class TestDnsmasq(TestBase):
def mock_get_conf_file_name(kind):
return '/dhcp/%s/%s' % (network.id, kind)
# Empty string passed to --conf-file in dnsmasq is invalid
# we must force '' to '/dev/null' because the dhcp agent
# does the same. Therefore we allow empty string to
# be passed to neutron but not to dnsmasq.
def check_conf_file_empty(cmd_list):
for i in cmd_list:
conf_file = ''
value = ''
if i.startswith('--conf-file='):
conf_file = i
value = i[12:].strip()
if not value:
idx = cmd_list.index(conf_file)
cmd_list[idx] = '--conf-file=/dev/null'
# if you need to change this path here, think twice,
# that means pid files will move around, breaking upgrades
# or backwards-compatibility
@ -1348,7 +1363,9 @@ class TestDnsmasq(TestBase):
expected.append('--dhcp-option-force=option:T1,%ds' % dhcp_t1)
if dhcp_t2:
expected.append('--dhcp-option-force=option:T2,%ds' % dhcp_t2)
expected.extend(extra_options)
check_conf_file_empty(expected)
self.execute.return_value = ('', '')