--- a/components/openstack/neutron/files/dhcp_agent.ini	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/openstack/neutron/files/dhcp_agent.ini	Tue Apr 07 13:31:20 2015 -0700
@@ -48,8 +48,9 @@
 # Override the default dnsmasq settings with this file
 # dnsmasq_config_file =
 
-# Use another DNS server before any in /etc/resolv.conf.
-# dnsmasq_dns_server =
+# Comma-separated list of DNS servers which will be used by dnsmasq
+# as forwarders.
+# dnsmasq_dns_servers =
 
 # Limit number of leases to prevent a denial-of-service.
 # dnsmasq_lease_max = 16777216
@@ -60,6 +61,14 @@
 # Location of Metadata Proxy UNIX domain socket
 # metadata_proxy_socket = $state_path/metadata_proxy
 
+# dhcp_delete_namespaces, which is false by default, can be set to True if
+# namespaces can be deleted cleanly on the host running the dhcp agent.
+# Do not enable this until you understand the problem with the Linux iproute
+# utility mentioned in https://bugs.launchpad.net/neutron/+bug/1052535 and
+# you are sure that your version of iproute does not suffer from the problem.
+# If True, namespaces will be deleted when a dhcp server is disabled.
+# dhcp_delete_namespaces = False
+
 # DeviceManager provides methods to setup/destroy dhcp ports on the
 # host running DHCP agent
 devicemanager = neutron.agent.solaris.device.DeviceManager