Merge pull request #2840 from toshywoshy/devel

Patch so that delegate_to also uses ansible_ssh_private_key_file
pull/4420/head
Michael DeHaan 2013-05-05 09:45:35 -07:00
commit 9ed177e25e
1 changed files with 1 additions and 1 deletions

View File

@ -527,7 +527,7 @@ class Runner(object):
actual_port = delegate_info.get('ansible_ssh_port', port) actual_port = delegate_info.get('ansible_ssh_port', port)
actual_user = delegate_info.get('ansible_ssh_user', actual_user) actual_user = delegate_info.get('ansible_ssh_user', actual_user)
actual_pass = delegate_info.get('ansible_ssh_pass', actual_pass) actual_pass = delegate_info.get('ansible_ssh_pass', actual_pass)
actual_private_key_file = delegate_info.get('private_key_file', self.private_key_file) actual_private_key_file = delegate_info.get('ansible_ssh_private_key_file', self.private_key_file)
actual_transport = delegate_info.get('ansible_connection', self.transport) actual_transport = delegate_info.get('ansible_connection', self.transport)
for i in delegate_info: for i in delegate_info:
if i.startswith("ansible_") and i.endswith("_interpreter"): if i.startswith("ansible_") and i.endswith("_interpreter"):