I've been working around this by just using a puppet-installer root key.
I just tinkered with my .ssh/config and now this works fine.