Update puppet_role to work on hostnames with no trailing digits