I needed to modify the site.pp to use $servername so it would work out of the box and that is the closest thing to the current behavior.
Nick Walker