ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #11663 from whereismyjetpack/fix_ansible_ssh_host

Browse source 
only set ansible_ssh_host if not already set
This commit is contained in:
James Cammarata 2015-07-26 23:46:21 -04:00
commit a1a8997e89
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/inventory/host.py
View file

@ -121,7 +121,9 @@ class Host:
results = combine_vars(results, self.vars) results = combine_vars(results, self.vars)
results['inventory_hostname'] = self.name results['inventory_hostname'] = self.name
results['inventory_hostname_short'] = self.name.split('.')[0] results['inventory_hostname_short'] = self.name.split('.')[0]
results['ansible_ssh_host'] = self.ipv4_address
if 'ansible_ssh_host' not in results:
results['ansible_ssh_host'] = self.ipv4_address
if 'ansible_ssh_port' not in results: if 'ansible_ssh_port' not in results:
results['ansible_ssh_port'] = C.DEFAULT_REMOTE_PORT results['ansible_ssh_port'] = C.DEFAULT_REMOTE_PORT