openstack/nova
Code Issues Proposed changes

Merge "always set --no-hosts for dnsmasq"

Browse Source
This commit is contained in:
Jenkins 2014-09-19 00:31:10 +00:00 committed by Gerrit Code Review
commit d7926ecfad
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/network/linux_net.py
View File

@ -1103,6 +1103,7 @@ def restart_dhcp(context, dev, network_ref, fixedips):
'--dhcp-lease-max=%s' % len(netaddr.IPNetwork(network_ref['cidr'])),
'--dhcp-hostsfile=%s' % _dhcp_file(dev, 'conf'),
'--dhcp-script=%s' % CONF.dhcpbridge,
'--no-hosts',
'--leasefile-ro']
# dnsmasq currently gives an error for an empty domain,
@ -1116,8 +1117,6 @@ def restart_dhcp(context, dev, network_ref, fixedips):
dns_servers.add(network_ref.get('dns1'))
if network_ref.get('dns2'):
dns_servers.add(network_ref.get('dns2'))
if network_ref['multi_host'] or dns_servers:
cmd.append('--no-hosts')
if network_ref['multi_host']:
cmd.append('--addn-hosts=%s' % _dhcp_file(dev, 'hosts'))
if dns_servers:

3
nova/tests/network/test_linux_net.py
View File

@ -675,6 +675,7 @@ class LinuxNetworkTestCase(test.NoDBTestCase):
'--dhcp-lease-max=256',
'--dhcp-hostsfile=%s' % linux_net._dhcp_file(dev, 'conf'),
'--dhcp-script=%s' % CONF.dhcpbridge,
'--no-hosts',
'--leasefile-ro']
if CONF.dhcp_domain:
@ -690,7 +691,6 @@ class LinuxNetworkTestCase(test.NoDBTestCase):
def test_dnsmasq_execute_dns_servers(self):
self.flags(dns_server=['1.1.1.1', '2.2.2.2'])
expected = [
'--no-hosts',
'--no-resolv',
'--server=1.1.1.1',
'--server=2.2.2.2',
@ -700,7 +700,6 @@ class LinuxNetworkTestCase(test.NoDBTestCase):
def test_dnsmasq_execute_use_network_dns_servers(self):
self.flags(use_network_dns_servers=True)
expected = [
'--no-hosts',
'--no-resolv',
'--server=8.8.4.4',
]