openstack
/
neutron
Code Issues Proposed changes

Merge "Drop strict-order flag from dnsmasq invocation" into stable/ocata

This commit is contained in:
Zuul 2018-11-06 16:16:11 +00:00 committed by Gerrit Code Review
parent c524291981 c7676b3031
commit a906630005
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -323,7 +323,6 @@ class Dnsmasq(DhcpLocalProcess):
'dnsmasq',
'--no-hosts',
_no_resolv,
'--strict-order',
'--except-interface=lo',
'--pid-file=%s' % pid_file,
'--dhcp-hostsfile=%s' % self.get_conf_file_name('host'),

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

@ -1091,7 +1091,6 @@ class TestDnsmasq(TestBase):
'dnsmasq',
'--no-hosts',
no_resolv,
'--strict-order',
'--except-interface=lo',
'--pid-file=%s' % expected_pid_file,
'--dhcp-hostsfile=/dhcp/%s/host' % network.id,