rpearce: Allow puppetmaster cname to be overwritten.

  * Convert puppetmaster to use machineset