ansible: _make_tmp_path now takes an argument.

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/action_plugins/fetch_cmd.py b/lib/action_plugins/fetch_cmd.py
index 99bdf2e..b460868 100644
--- a/lib/action_plugins/fetch_cmd.py
+++ b/lib/action_plugins/fetch_cmd.py
@@ -25,37 +25,38 @@ class ActionModule(ActionBase):
     def run(self, tmp=None, task_vars=None):
         if task_vars is None:
             task_vars = dict()
 
         if self._play_context.check_mode:
             return dict(skipped=True, msg='check mode not supported for this module')
 
         result = super(ActionModule, self).run(tmp, task_vars)
 
         cmd = self._task.args.get('cmd', None)
         stdin = self._task.args.get('stdin', None)
         dest = self._task.args.get('dest', None)
 
         if cmd is None or dest is None:
             return dict(failed=True, msg="cmd and dest are required")
 
         if stdin is not None:
             stdin = self._connection._shell.join_path(stdin)
             stdin = self._remote_expand_user(stdin)
 
-        stdout = self._connection._shell.join_path(self._make_tmp_path(), 'stdout')
+        remote_user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user
+        stdout = self._connection._shell.join_path(self._make_tmp_path(remote_user), 'stdout')
         result.update(self._execute_module(module_args=dict(cmd=cmd, stdin=stdin, dest=stdout), task_vars=task_vars))
 
         # calculate checksum for the local file
         local_checksum = checksum(dest)
 
         # calculate checksum for the remote file, don't bother if using become as slurp will be used
         remote_checksum = self._remote_checksum(stdout, all_vars=task_vars) 
 
         if remote_checksum != local_checksum:
             makedirs_safe(os.path.dirname(dest))
             self._connection.fetch_file(stdout, dest)
             if checksum(dest) == remote_checksum:
                 result.update(dict(changed=True))
             else:
                 result.update(dict(failed=True))
         return result
diff --git a/lib/action_plugins/openldap.py b/lib/action_plugins/openldap.py
index a66c3aa..ad77abc 100644
--- a/lib/action_plugins/openldap.py
+++ b/lib/action_plugins/openldap.py
@@ -30,39 +30,40 @@ class ActionModule(ActionBase):
         result = super(ActionModule, self).run(tmp, task_vars)
 
         target = self._task.args.get('target', None)
         local = self._task.args.get('local', 'no')
 
         if local not in [ 'no', 'file', 'template' ]:
             return dict(failed=True, msg="local must be in ['no','file','template']")
 
         if local != 'no' and target is None:
             return dict(failed=True, msg="target is required in local mode")
 
         if local == 'no':
             # run the module remotely
             return self._execute_module(module_args=self._task.args, task_vars=task_vars)
 
         if self._task._role is not None:
             target = self._loader.path_dwim_relative(self._task._role._role_path, local+'s', target)
         else:
             target = self._loader.path_dwim_relative(self._loader.get_basedir(), local+'s', target)
 
+        remote_user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user
         new_module_args = self._task.args.copy()
-        new_module_args['target'] = self._connection._shell.join_path(self._make_tmp_path(), 'target.ldif')
+        new_module_args['target'] = self._connection._shell.join_path(self._make_tmp_path(remote_user), 'target.ldif')
         new_module_args['local'] = 'no'
 
         if local == 'template':
             # template the source data locally
             try:
                 with open(target, 'r') as f:
                     template_data = to_unicode(f.read())
                 target = self._templar.template(template_data, preserve_trailing_newlines=True, escape_backslashes=False, convert_data=False)
             except Exception as e:
                 result['failed'] = True
                 result['msg'] = type(e).__name__ + ": " + str(e)
                 return result
 
         # transfer the file and run the module remotely
         self._transfer_data(new_module_args['target'], target)
         result.update(self._execute_module(module_args=new_module_args, task_vars=task_vars))
         return result