I have to admit I'm not a huge fan of Puppet, though I've used it a little recently and I've been a regular CFEngine (2.x) user for the past few years.

I hope it is useful, but if you get stuck or have suggestions/comments feel free to mail me.