Fix logic errors in validate cluster and make it work for vagrant again