I've switched to using Ansible for this very reason (after getting frustated with Puppet) - I like it a lot. Also I just want to join the choir: Vagrant is awesome!