The way we went at my last employer was to setup a...
# puppet
l
The way we went at my last employer was to setup a puppet server per tier (or at least separate preprod and prod), then we gave each product a control-repo and environment, and we gave the infrastructure team a control repo that deployed to the basemodulepath (which is included behind environments everywhere)