Adding hieradata and puppetmaster param
Changing server param names and template definition