Set tunnel_type and tunnel_types.  Trying to get dhcp to work...

Change-Id: I28cc714c500a7df71f01058a7c1526056a968b1e