Move roles to hiera (base and puppet_master) and remove double quotes