mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #11699 from ahamilton55/ah/delegate_variable
v2: Fixing delegate_to when using a variable
This commit is contained in:
commit
857f584ebf
1 changed files with 9 additions and 9 deletions
|
@ -455,9 +455,6 @@ class TaskExecutor:
|
|||
# get the vars for the delegate by its name
|
||||
try:
|
||||
this_info = variables['hostvars'][self._task.delegate_to]
|
||||
except:
|
||||
# make sure the inject is empty for non-inventory hosts
|
||||
this_info = {}
|
||||
|
||||
# get the real ssh_address for the delegate and allow ansible_ssh_host to be templated
|
||||
#self._play_context.remote_user = self._compute_delegate_user(self.delegate_to, delegate['inject'])
|
||||
|
@ -467,6 +464,9 @@ class TaskExecutor:
|
|||
self._play_context.private_key_file = this_info.get('ansible_ssh_private_key_file', self._play_context.private_key_file)
|
||||
self._play_context.connection = this_info.get('ansible_connection', C.DEFAULT_TRANSPORT)
|
||||
self._play_context.become_pass = this_info.get('ansible_sudo_pass', self._play_context.become_pass)
|
||||
except:
|
||||
# make sure the inject is empty for non-inventory hosts
|
||||
this_info = {}
|
||||
|
||||
if self._play_context.remote_addr in ('127.0.0.1', 'localhost'):
|
||||
self._play_context.connection = 'local'
|
||||
|
|
Loading…
Reference in a new issue