Merge pull request #13074 from joernheissler/patch-13073

Use ansible_host in synchronize module
9 years ago · 72558f7ecd
parent c97c101bd3 647b92a79b
commit 72558f7ecd
1 changed files with 7 additions and 1 deletions
--- a/lib/ansible/plugins/action/synchronize.py
+++ b/lib/ansible/plugins/action/synchronize.py
@ -131,7 +131,13 @@ class ActionModule(ActionBase):
        src_host = '127.0.0.1'
        inventory_hostname = task_vars.get('inventory_hostname')
        dest_host_inventory_vars = task_vars['hostvars'].get(inventory_hostname)
-        dest_host = dest_host_inventory_vars.get('ansible_ssh_host', inventory_hostname)
+        try:
+            dest_host = dest_host_inventory_vars['ansible_host']
+        except KeyError:
+            try:
+                dest_host = dest_host_inventory_vars['ansible_ssh_host']
+            except KeyError:
+                dest_host = inventory_hostname

        dest_is_local = dest_host in C.LOCALHOST