Move variable assignment to the top, because it affects our packaging tasks
Update certain redhat file templates to use @name

Not hardcoded 'puppetdb'

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
whitespace fix