--- a/components/openstack/neutron/files/dhcp_agent.ini	Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/neutron/files/dhcp_agent.ini	Fri May 20 17:42:29 2016 -0400
@@ -9,7 +9,23 @@
 
 # The DHCP agent requires an interface driver be set. Choose the one that best
 # matches your plugin.
-# Solaris Elastic Virtual Switch (EVS)
+
+# Example of interface_driver option for OVS based plugins(OVS, Ryu, NEC, NVP,
+# BigSwitch/Floodlight)
+# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+
+# Name of Open vSwitch bridge to use
+# ovs_integration_bridge = br-int
+
+# Use veth for an OVS interface or not.
+# Support kernels with limited namespace support
+# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
+# ovs_use_veth = False
+
+# Example of interface_driver option for LinuxBridge
+# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+
+# Interface driver for Solaris Elastic Virtual Switch (EVS)
 interface_driver = neutron.agent.solaris.interface.SolarisVNICDriver
 
 # The agent can use other DHCP drivers.  Dnsmasq is the simplest and requires
@@ -17,7 +33,9 @@
 dhcp_driver = neutron.agent.solaris.dhcp.Dnsmasq
 
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
-# iproute2 package that supports namespaces).
+# iproute2 package that supports namespaces). This option is deprecated and
+# will be removed in a future release, at which point the old behavior of
+# use_namespaces = True will be enforced.
 use_namespaces = False
 
 # The DHCP server can assist with providing metadata support on isolated
@@ -58,8 +76,8 @@
 # Location to DHCP lease relay UNIX domain socket
 # dhcp_lease_relay_socket = $state_path/dhcp/lease_relay
 
-# Location of Metadata Proxy UNIX domain socket
-# metadata_proxy_socket = $state_path/metadata_proxy
+# Use broadcast in DHCP replies
+# dhcp_broadcast_reply = False
 
 # 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.
@@ -69,9 +87,9 @@
 # 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
+# Timeout for ovs-vsctl commands.
+# If the timeout expires, ovs commands will fail with ALARMCLOCK error.
+# ovs_vsctl_timeout = 10
 
 # An URI that specifies an EVS controller. It is of the form
 # ssh://user@hostname, where user is the username to use to connect