tomd/gcarlyle: more robust etc/hosts setup for new puppetmaster