use fqdn, not hostname
Merge branch 'master' of github.com:NLNOG/ring-puppet