set remote_user to default if none is found when using delegate_to (a…

…nsible#16138)
bigjools · Jun 7, 2016 · ef9238a · ef9238a
1 parent b479a80
commit ef9238a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py
@@ -356,7 +356,7 @@ def set_task_and_variable_override(self, task, variables, templar):
 
             # and likewise for the remote user
             for user_var in MAGIC_VARIABLE_MAPPING.get('remote_user'):
-                if user_var in delegated_vars:
+                if user_var in delegated_vars and delegated_vars[user_var]:
                     break
             else:
                 delegated_vars['ansible_user'] = task.remote_user or self.remote_user