Merge "Add missing hiera vars for bifrost"