make sure to user cluster when specified

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
Merge pull request #86 from alfredodeza/6288

make sure to user cluster when specified