Comment 6 for bug 1463092

This looks like it makes sense, and dprince was talking about wanting to rewrite the hiera element anyway - as a bonus this approach removes one of the last remaining dependencies on oac in the templates.

I'll try to dig into the details later and see how it works in practice.