archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

only set ansible_ssh_host if not already set

Browse Source
pull/11663/head
Dann Bohn 9 years ago
parent 5347db2952
commit 3e79bfa2d6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File

4
lib/ansible/inventory/host.py
Unescape Escape 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

Write Preview
Loading…
Cancel
Save