adjustments to hiera router to break out the gce stuff a little