ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Make tests happy

Browse source
This commit is contained in:
Aleksey Ovcharenko 2013-11-22 04:06:10 +02:00
parent 2222f6df58
commit 30678e04ac
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/runner/__init__.py
View file

@ -584,9 +584,12 @@ 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 = os.path.expanduser(inject.get('ansible_ssh_private_key_file', self.private_key_file)) actual_private_key_file = 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 actual_private_key_file is not None:
actual_private_key_file = os.path.expanduser(actual_private_key_file)
if self.accelerate and actual_transport != 'local': if self.accelerate and actual_transport != 'local':
#Fix to get the inventory name of the host to accelerate plugin #Fix to get the inventory name of the host to accelerate plugin
if inject.get('ansible_ssh_host', None): if inject.get('ansible_ssh_host', None):
@ -626,6 +629,10 @@ class Runner(object):
actual_private_key_file = os.path.expanduser(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)
if actual_private_key_file is not None:
actual_private_key_file = os.path.expanduser(actual_private_key_file)
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"):
inject[i] = delegate_info[i] inject[i] = delegate_info[i]

4
lib/ansible/runner/action_plugins/synchronize.py
View file

@ -79,9 +79,11 @@ 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 = 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: if not private_key is None:
private_key = os.path.expanduser(private_key)
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)
dest = self._process_origin(dest_host, dest, user) dest = self._process_origin(dest_host, dest, user)