Get rid of redundant and confusing $cluster defs.

Also a couple of fixes where:
- one definition in site.pp was wrong
- $cluster gets tampered with in the kafka role.

Change-Id: I6ca776039260a800555302a1468e2ecc74f9856c
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>