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

Fixes 5870 Template delegate hostname earlier in the process

Browse source
This commit is contained in:
James Tanner 2014-02-04 13:31:22 -05:00
parent e0429a4004
commit 5fafc61008
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -304,7 +304,10 @@ class Runner(object):
delegate = {} delegate = {}
delegate['host'] = host # allow ansible_ssh_host to be templated
delegate['host'] = template.template(self.basedir, host,
remote_inject, fail_on_undefined=True)
delegate['inject'] = remote_inject.copy() delegate['inject'] = remote_inject.copy()
# set any interpreters # set any interpreters
@ -324,10 +327,6 @@ class Runner(object):
# get the real ssh_address for the delegate # get the real ssh_address for the delegate
delegate['ssh_host'] = this_info.get('ansible_ssh_host', delegate['host']) delegate['ssh_host'] = this_info.get('ansible_ssh_host', delegate['host'])
# allow ansible_ssh_host to be templated
delegate['host'] = template.template(self.basedir, this_host,
delegate['inject'], fail_on_undefined=True)
delegate['port'] = this_info.get('ansible_ssh_port', port) delegate['port'] = this_info.get('ansible_ssh_port', port)
delegate['user'] = self._compute_delegate_user(this_host, delegate['inject']) delegate['user'] = self._compute_delegate_user(this_host, delegate['inject'])
delegate['pass'] = this_info.get('ansible_ssh_pass', password) delegate['pass'] = this_info.get('ansible_ssh_pass', password)