Revert "Merge pull request #5001 from ovcharenko/devel"

This reverts commit d6c3103a00, reversing
changes made to b11f96eaa4.
This commit is contained in:
James Tanner 2013-11-22 00:09:37 -05:00
parent e0b0a89231
commit 512ebdb971
2 changed files with 3 additions and 3 deletions

View file

@ -79,7 +79,7 @@ class ActionModule(object):
if not dest_host is src_host:
user = inject.get('ansible_ssh_user',
self.runner.remote_user)
private_key = os.path.expanduser(inject.get('ansible_ssh_private_key_file', self.runner.private_key_file))
private_key = inject.get('ansible_ssh_private_key_file', self.runner.private_key_file)
if not private_key is None:
options['private_key'] = private_key
src = self._process_origin(src_host, src, user)