shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Look at 'ansible_host' for callbacks, not just 'ansible_ssh_host'.

Browse Source
This commit is contained in:
Bill Nottingham 2016-12-08 13:59:23 -05:00
parent 26adcf5972
commit 2e39070ffd
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/api/views.py
View File

@ -2564,20 +2564,22 @@ class JobTemplateCallback(GenericAPIView):
# Next, try matching based on name or ansible_ssh_host variable. # Next, try matching based on name or ansible_ssh_host variable.
matches = set() matches = set()
for host in hosts: for host in hosts:
ansible_ssh_host = host.variables_dict.get('ansible_ssh_host', '') for host_var in ['ansible_ssh_host', 'ansible_host']:
if ansible_ssh_host in remote_hosts: ansible_host = host.variables_dict.get(host_var, '')
matches.add(host) if ansible_host in remote_hosts:
if host.name != ansible_ssh_host and host.name in remote_hosts: matches.add(host)
matches.add(host) if host.name != ansible_host and host.name in remote_hosts:
matches.add(host)
if len(matches) == 1: if len(matches) == 1:
return matches return matches
# Try to resolve forward addresses for each host to find matches. # Try to resolve forward addresses for each host to find matches.
for host in hosts: for host in hosts:
hostnames = set([host.name]) hostnames = set([host.name])
ansible_ssh_host = host.variables_dict.get('ansible_ssh_host', '') for host_var in ['ansible_ssh_host', 'ansible_host']:
if ansible_ssh_host: ansible_host = host.variables_dict.get(host_var, '')
hostnames.add(ansible_ssh_host) if ansible_host:
hostnames.add(ansible_host)
for hostname in hostnames: for hostname in hostnames:
try: try:
result = socket.getaddrinfo(hostname, None) result = socket.getaddrinfo(hostname, None)