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

Merge pull request #11616 from halberom/ssh_port

Browse source 
fixes 11607, override ansible_ssh_port in group/host_vars
This commit is contained in:
Brian Coca 2015-07-17 11:21:17 -04:00
commit bc5a7fce79
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,8 +78,6 @@ class Host:
if port and port != C.DEFAULT_REMOTE_PORT: if port and port != C.DEFAULT_REMOTE_PORT:
self.set_variable('ansible_ssh_port', int(port)) self.set_variable('ansible_ssh_port', int(port))
else:
self.set_variable('ansible_ssh_port', C.DEFAULT_REMOTE_PORT)
self._gathered_facts = False self._gathered_facts = False
@ -124,6 +122,10 @@ class Host:
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 results['ansible_ssh_host'] = self.ipv4_address
if 'ansible_ssh_port' not in results:
results['ansible_ssh_port'] = C.DEFAULT_REMOTE_PORT
results['group_names'] = sorted([ g.name for g in groups if g.name != 'all']) results['group_names'] = sorted([ g.name for g in groups if g.name != 'all'])
return results return results