Merge "Updated for deprecated "ansible_ssh_user""

This commit is contained in:
Jenkins 2016-10-26 16:08:41 +00:00 committed by Gerrit Code Review
commit b34c7376cf

View File

@ -465,7 +465,12 @@ class ActionModule(ActionBase):
"""Run the method""" """Run the method"""
try: try:
remote_user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user remote_user = task_vars.get('ansible_user')
if not remote_user:
remote_user = task_vars.get('ansible_ssh_user')
if not remote_user:
remote_user = self._play_context.remote_user
if not tmp: if not tmp:
tmp = self._make_tmp_path(remote_user) tmp = self._make_tmp_path(remote_user)
except TypeError: except TypeError: