Yes, I am leaning more towards this solution than using only ssh. And a branch will help somewhat towards freezing their environment until their way-too-belated demise. I sure wish puppet could gather facts with ssh like ansible... for situations like these. 🙂