The idea is to create a staging branch for puppet which runs on the staging lab servers, then move to the current prod branch after staging verification.

One Problem:

We control DHCP and other config files via puppet and need to make changes to them in near real times. Move them to a different repo?

Also, we would want to automatically validate behavior on the staging servers (?via the current push test?), and need to create a push process for updating the rest of the lab.