openstack/neutron
Code Issues Proposed changes

Merge "DHCP: delete config option dnsmasq_dns_server"

Browse Source
This commit is contained in:
Jenkins
2016-06-14 23:07:24 +00:00
committed by Gerrit Code Review
parent bd4e0a38b5 eb965f99de
commit 1381c5e71d
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/dhcp/config.py
View File

@@ -78,9 +78,9 @@ DNSMASQ_OPTS = [
help=_('Override the default dnsmasq settings ' help=_('Override the default dnsmasq settings '
'with this file.')), 'with this file.')),
cfg.ListOpt('dnsmasq_dns_servers', cfg.ListOpt('dnsmasq_dns_servers',
default=[],
help=_('Comma-separated list of the DNS servers which will be ' help=_('Comma-separated list of the DNS servers which will be '
'used as forwarders.'), 'used as forwarders.')),
deprecated_name='dnsmasq_dns_server'),
cfg.StrOpt('dnsmasq_base_log_dir', cfg.StrOpt('dnsmasq_base_log_dir',
help=_("Base log dir for dnsmasq logging. " help=_("Base log dir for dnsmasq logging. "
"The log contains DHCP and DNS log information and " "The log contains DHCP and DNS log information and "

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

@@ -390,10 +390,8 @@ class Dnsmasq(DhcpLocalProcess):
min(possible_leases, self.conf.dnsmasq_lease_max)) min(possible_leases, self.conf.dnsmasq_lease_max))
cmd.append('--conf-file=%s' % self.conf.dnsmasq_config_file) cmd.append('--conf-file=%s' % self.conf.dnsmasq_config_file)
if self.conf.dnsmasq_dns_servers: for server in self.conf.dnsmasq_dns_servers:
cmd.extend( cmd.append('--server=%s' % server)
'--server=%s' % server
for server in self.conf.dnsmasq_dns_servers)
if self.conf.dhcp_domain: if self.conf.dhcp_domain:
cmd.append('--domain=%s' % self.conf.dhcp_domain) cmd.append('--domain=%s' % self.conf.dhcp_domain)

5
releasenotes/notes/dnsmasq_dns_servers-d729c04887ce67b4.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
upgrade:
- The configuration option dnsmasq_dns_server was
deprecated in the kilo cycle. This value is no longer
supported.