Merge pull request #11663 from whereismyjetpack/fix_ansible_ssh_host

only set ansible_ssh_host if not already set
2015-07-26 23:46:21 -04:00 · 2015-07-26 23:46:21 -04:00 · a1a8997e89
parent a56ff7ae54 3e79bfa2d6
commit a1a8997e89
1 changed files with 3 additions and 1 deletions
--- a/lib/ansible/inventory/host.py
+++ b/lib/ansible/inventory/host.py
@ -121,7 +121,9 @@ class Host:
        results = combine_vars(results, self.vars)
        results['inventory_hostname'] = self.name
        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:
            results['ansible_ssh_port'] = C.DEFAULT_REMOTE_PORT