This patch allows a deployer to specify which tunnel_type s/he wants her openstack installation to rely on.