Using the common ansible_command function

Missed using this in a few places.  Also, corrected the private
key persistence.