Merge "Fix tunnel_types hieradata on compute nodes"