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

Fixes templating of ansible_ssh_host for delegates

Browse source
This commit is contained in:
Serge van Ginderachter 2014-02-27 18:06:34 +01:00 committed by James Cammarata
parent 53788e4c98
commit c85081e9a9
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

@ -308,7 +308,7 @@ class Runner(object):
delegate = {} delegate = {}
# allow ansible_ssh_host to be templated # allow delegated host to be templated
delegate['host'] = template.template(self.basedir, host, delegate['host'] = template.template(self.basedir, host,
remote_inject, fail_on_undefined=True) remote_inject, fail_on_undefined=True)
@ -333,7 +333,10 @@ class Runner(object):
this_info = {} this_info = {}
# 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']) # 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) delegate['port'] = this_info.get('ansible_ssh_port', port)