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

Merge pull request #6213 from sergevanginderachter/fix-delegate-templating

Browse source 
Fixes templating of ansible_ssh_host for delegates.

Tested that this works. Confirmed.
This commit is contained in:
Richard Isaacson 2014-03-03 23:10:09 -06:00
commit e79d859dfb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -303,7 +303,7 @@ class Runner(object):
delegate = {}
# allow ansible_ssh_host to be templated
# allow delegated host to be templated
delegate['host'] = template.template(self.basedir, host,
remote_inject, fail_on_undefined=True)
@ -328,7 +328,10 @@ class Runner(object):
this_info = {}
# get the real ssh_address for the delegate
delegate['ssh_host'] = this_info.get('ansible_ssh_host', delegate['host'])
# and allow ansible_ssh_host to be templated
delegate['ssh_host'] = template.template(self.basedir,
this_info.get('ansible_ssh_host', this_host),
this_info, fail_on_undefined=True)
delegate['port'] = this_info.get('ansible_ssh_port', port)