DHCP: delete config option dnsmasq_dns_server

This field was marked as deprecated In commit
a269541c60. That was in Kilo
which has provided enough time for admins to addjust to this.

In addition to this the patch sets the default value as [].
If a value is not specified this is None and that should not be
the default list.

DocImpact
UpgradeImpact

Change-Id: Ieaf18ffc9baf7e1caebe9de47017338bebd92c84
This commit is contained in:
Gary Kotton 2016-06-14 00:47:14 -07:00
parent 8254f46548
commit eb965f99de
3 changed files with 9 additions and 6 deletions

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 "

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)

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.