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

only set ansible_ssh_host if not already set

Browse source
This commit is contained in:
Dann Bohn 2015-07-20 15:43:55 -04:00
parent 5347db2952
commit 3e79bfa2d6
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