cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed delegate_to ref in syncronize

Browse source
This commit is contained in:
Brian Coca 2015-07-30 20:53:18 -04:00
parent 8a00dff989
commit 9aa4214417
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/plugins/action/synchronize.py
View file

@ -140,14 +140,12 @@ class ActionModule(ActionBase):
user = None user = None
if boolean(task_vars.get('set_remote_user', 'yes')): if boolean(task_vars.get('set_remote_user', 'yes')):
if use_delegate:
user = task_vars['hostvars'][conn.delegate].get('ansible_ssh_user')
if not use_delegate or not user: if not use_delegate or not user:
user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user
elif use_delegate:
user = task_vars['hostvars'][task_vars.get('delegate_to')].get('ansible_ssh_user')
if use_delegate: if use_delegate:
# FIXME
private_key = task_vars.get('ansible_ssh_private_key_file') or self._play_context.private_key_file private_key = task_vars.get('ansible_ssh_private_key_file') or self._play_context.private_key_file
else: else:
private_key = task_vars.get('ansible_ssh_private_key_file') or self._play_context.private_key_file private_key = task_vars.get('ansible_ssh_private_key_file') or self._play_context.private_key_file