It's pretty easy to merge a static and dynamic inventory in Ansible. I also can't see sticking with puppet if you're already moving to use ansible to converge.

It's pretty easy to merge a static and dynamic inventory in Ansible. I also can't see sticking with puppet if you're already moving to use ansible to converge. Ansible+good inventory scripts+The foreman ftw.