openstack/neutron
Code Issues Proposed changes

Merge "Drop strict-order flag from dnsmasq invocation"

Browse Source
This commit is contained in:
Zuul 2018-03-17 02:37:08 +00:00 committed by Gerrit Code Review
commit ea19589e6d
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

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

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

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