From c50364d5852de7446462d0b986d72dc2786df6eb Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 29 Jun 2016 02:52:49 +0200
Subject: ansible: _make_tmp_path now takes an argument.
---
lib/action_plugins/fetch_cmd.py | 3 ++-
lib/action_plugins/openldap.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'lib')
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
@@ -42,7 +42,8 @@ class ActionModule(ActionBase):
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
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
@@ -47,8 +47,9 @@ class ActionModule(ActionBase):
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':
--
cgit v1.2.3