Changed puppetmaster ip + fqdn to standard puppet variables
Removed puppet and etckeeper