Merge "Enable dhcp service flag set for ODL Dhcp"

diff --cc jjb/integration/integration-deploy-openstack-run-test.sh
index 275e6c9c4a2613e88917aa4daafb5b694ca97e85,685b25d7e8d0b11c334e717830fb93036327e123..d155edb2ea54ee7f3fb480775310aead7fc5a3e8
--- 1/jjb/integration/integration-deploy-openstack-run-test.sh
--- 2/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@@ -384,11 -345,18 +384,22 @@@ minimize_polling=Tru
  # MTU(1400) + VXLAN(50) + VLAN(4) = 1454 < MTU eth0/br-physnet1(1458)
  physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400
  path_mtu = 1458
+ EOF
+ 
+     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+         cat >> ${local_conf_file_name} << EOF
+ 
+ [ml2_odl]
+ enable_dhcp_service = True
+ EOF
+     fi
+ 
+     cat >> ${local_conf_file_name} << EOF
  
 +[ml2_odl]
 +# Trigger n-odl full sync every 30 secs.
 +maintenance_interval = 30
 +
  [[post-config|/etc/neutron/dhcp_agent.ini]]
  [DEFAULT]
  force_metadata = True