aboutsummaryrefslogtreecommitdiff
path: root/ansible/action_plugins
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/action_plugins')
-rw-r--r--ansible/action_plugins/merge_configs.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py
index b5df51fdc..556f6233f 100644
--- a/ansible/action_plugins/merge_configs.py
+++ b/ansible/action_plugins/merge_configs.py
@@ -16,6 +16,7 @@
from ConfigParser import ConfigParser
from cStringIO import StringIO
+import inspect
import os
from ansible.plugins.action import ActionBase
@@ -41,8 +42,16 @@ class ActionModule(ActionBase):
task_vars = dict()
result = super(ActionModule, self).run(tmp, task_vars)
- if not tmp:
+ # NOTE(jeffrey4l): Ansible 2.1 add a remote_user param to the
+ # _make_tmp_path function. inspect the number of the args here. In
+ # this way, ansible 2.0 and ansible 2.1 are both supported
+ make_tmp_path_args = inspect.getargspec(self._make_tmp_path)[0]
+ if not tmp and len(make_tmp_path_args) == 1:
tmp = self._make_tmp_path()
+ if not tmp and len(make_tmp_path_args) == 2:
+ remote_user = (task_vars.get('ansible_ssh_user')
+ or self._play_context.remote_user)
+ tmp = self._make_tmp_path(remote_user)
sources = self._task.args.get('sources', None)
extra_vars = self._task.args.get('vars', list())