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

Merge pull request #1378 from dhozac/ansible_ssh-fixes

Browse source 
Fixes for ansible_ssh_host and ansible_ssh_port
This commit is contained in:
Michael DeHaan 2012-10-18 16:54:20 -07:00
commit 6300d93132
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,13 +391,16 @@ class Runner(object):
delegate_to = inject.get('delegate_to', None) delegate_to = inject.get('delegate_to', None)
if delegate_to is not None: if delegate_to is not None:
delegate_to = utils.template(self.basedir, delegate_to, inject) delegate_to = utils.template(self.basedir, delegate_to, inject)
delegate_info = inject['hostvars'][delegate_to] try:
actual_host = delegate_info.get('ansible_ssh_host', delegate_to) delegate_info = inject['hostvars'][delegate_to]
actual_port = delegate_info.get('ansible_ssh_port', port) actual_host = delegate_info.get('ansible_ssh_host', delegate_to)
actual_port = delegate_info.get('ansible_ssh_port', port)
except errors.AnsibleError:
actual_host = delegate_to
try: try:
# connect # connect
conn = self.connector.connect(actual_host, actual_port) conn = self.connector.connect(actual_host, int(actual_port))
if delegate_to: if delegate_to:
conn.delegate = host conn.delegate = host