internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5001 from ovcharenko/devel

Browse Source 
Allow to specify ansible_ssh_private_key_file location related to user home directory
This commit is contained in:
Michael DeHaan
2013-11-21 15:58:45 -08:00
parent b11f96eaa4 2222f6df58
commit d6c3103a00
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/runner/__init__.py
View File

@@ -584,7 +584,7 @@ class Runner(object):
actual_user = inject.get('ansible_ssh_user', self.remote_user) actual_user = inject.get('ansible_ssh_user', self.remote_user)
actual_pass = inject.get('ansible_ssh_pass', self.remote_pass) actual_pass = inject.get('ansible_ssh_pass', self.remote_pass)
actual_transport = inject.get('ansible_connection', self.transport) actual_transport = inject.get('ansible_connection', self.transport)
actual_private_key_file = inject.get('ansible_ssh_private_key_file', self.private_key_file) actual_private_key_file = os.path.expanduser(inject.get('ansible_ssh_private_key_file', self.private_key_file))
self.sudo_pass = inject.get('ansible_sudo_pass', self.sudo_pass) self.sudo_pass = inject.get('ansible_sudo_pass', self.sudo_pass)
if self.accelerate and actual_transport != 'local': if self.accelerate and actual_transport != 'local':
@@ -623,7 +623,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('ansible_ssh_private_key_file', self.private_key_file) actual_private_key_file = os.path.expanduser(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)
self.sudo_pass = delegate_info.get('ansible_sudo_pass', self.sudo_pass) self.sudo_pass = delegate_info.get('ansible_sudo_pass', self.sudo_pass)
for i in delegate_info: for i in delegate_info:

2
lib/ansible/runner/action_plugins/synchronize.py
View File

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