I have been administering puppet installations for almost five years; FIVE years! I have always known that at some point, node management would become an issue. Unfortunately, I have never worked with an infrastructure that had massive numbers of exactly identical servers. I started by configuring nodes to inherit group definitions that were stored in another manifest. Then I saw the environments feature but never implemented it mostly due to overhead and the numerous and well documented bugs that will be solved in Puppet 4.