You should check out Saltstack if you haven't already. It's actually not far from what your doing now...