salt: fix scoping and cluster definition

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