From eb965f99ded8a46db220d540bcaea5d67f5b2d08 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@vmware.com>
Date: Tue, 14 Jun 2016 00:47:14 -0700
Subject: [PATCH] DHCP: delete config option dnsmasq_dns_server

This field was marked as deprecated In commit
a269541c603f8923b35b7e722f1b8c0ebd42c95a. 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
---
 neutron/agent/dhcp/config.py                                | 4 ++--
 neutron/agent/linux/dhcp.py                                 | 6 ++----
 .../notes/dnsmasq_dns_servers-d729c04887ce67b4.yaml         | 5 +++++
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/dnsmasq_dns_servers-d729c04887ce67b4.yaml

diff --git a/neutron/agent/dhcp/config.py b/neutron/agent/dhcp/config.py
index 46f8ab63ad2..48ef57ab50b 100644
--- a/neutron/agent/dhcp/config.py
+++ b/neutron/agent/dhcp/config.py
@@ -78,9 +78,9 @@ DNSMASQ_OPTS = [
                help=_('Override the default dnsmasq settings '
                       'with this file.')),
     cfg.ListOpt('dnsmasq_dns_servers',
+                default=[],
                 help=_('Comma-separated list of the DNS servers which will be '
-                       'used as forwarders.'),
-                deprecated_name='dnsmasq_dns_server'),
+                       'used as forwarders.')),
     cfg.StrOpt('dnsmasq_base_log_dir',
                help=_("Base log dir for dnsmasq logging. "
                       "The log contains DHCP and DNS log information and "
diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
index ee855dc9acc..4067933ddef 100644
--- a/neutron/agent/linux/dhcp.py
+++ b/neutron/agent/linux/dhcp.py
@@ -390,10 +390,8 @@ class Dnsmasq(DhcpLocalProcess):
                    min(possible_leases, self.conf.dnsmasq_lease_max))
 
         cmd.append('--conf-file=%s' % self.conf.dnsmasq_config_file)
-        if self.conf.dnsmasq_dns_servers:
-            cmd.extend(
-                '--server=%s' % server
-                for server in self.conf.dnsmasq_dns_servers)
+        for server in self.conf.dnsmasq_dns_servers:
+            cmd.append('--server=%s' % server)
 
         if self.conf.dhcp_domain:
             cmd.append('--domain=%s' % self.conf.dhcp_domain)
diff --git a/releasenotes/notes/dnsmasq_dns_servers-d729c04887ce67b4.yaml b/releasenotes/notes/dnsmasq_dns_servers-d729c04887ce67b4.yaml
new file mode 100644
index 00000000000..a1dd5142a17
--- /dev/null
+++ b/releasenotes/notes/dnsmasq_dns_servers-d729c04887ce67b4.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - The configuration option dnsmasq_dns_server was
+    deprecated in the kilo cycle. This value is no longer
+    supported.