From 30d481ac571f1c95bcc7c69a09100c1af935445a Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Fri, 2 Oct 2015 12:58:15 -0400 Subject: [PATCH] Fix old-style (non-python) module support --- lib/ansible/plugins/action/__init__.py | 23 +++++++++++++++-------- lib/ansible/plugins/shell/sh.py | 4 +++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 25fe03192e6..6a3b9581f85 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -22,12 +22,13 @@ __metaclass__ = type import base64 import json import os +import pipes import random import stat import tempfile import time -from six import string_types +from six import string_types, iteritems from six.moves import StringIO from ansible import constants as C @@ -362,17 +363,26 @@ class ActionBase: # a remote tmp path may be necessary and not already created remote_module_path = None + args_file_path = None if not tmp and self._late_needs_tmp_path(tmp, module_style): tmp = self._make_tmp_path() if tmp: remote_module_path = self._connection._shell.join_path(tmp, module_name) + if module_style == 'old': + # we'll also need a temp file to hold our module arguments + args_file_path = self._connection._shell.join_path(tmp, 'args') - # FIXME: async stuff here? - #if (module_style != 'new' or async_jid is not None or not self._connection._has_pipelining or not self._play_context.pipelining or C.DEFAULT_KEEP_REMOTE_FILES): - if remote_module_path: + if remote_module_path or module_style != 'new': self._display.debug("transferring module to remote") self._transfer_data(remote_module_path, module_data) + if module_style == 'old': + # we need to dump the module args to a k=v string in a file on + # the remote system, which can be read and parsed by the module + args_data = "" + for k,v in iteritems(module_args): + args_data += '%s="%s" ' % (k, pipes.quote(v)) + self._transfer_data(args_file_path, args_data) self._display.debug("done transferring module to remote") environment_string = self._compute_environment_string() @@ -384,9 +394,6 @@ class ActionBase: cmd = "" in_data = None - # FIXME: all of the old-module style and async stuff has been removed from here, and - # might need to be re-added (unless we decide to drop support for old-style modules - # at this point and rework things to support non-python modules specifically) if self._connection.has_pipelining and self._play_context.pipelining and not C.DEFAULT_KEEP_REMOTE_FILES: in_data = module_data else: @@ -399,7 +406,7 @@ class ActionBase: # not sudoing or sudoing to root, so can cleanup files in the same step rm_tmp = tmp - cmd = self._connection._shell.build_module_command(environment_string, shebang, cmd, rm_tmp) + cmd = self._connection._shell.build_module_command(environment_string, shebang, cmd, arg_path=args_file_path, rm_tmp=rm_tmp) cmd = cmd.strip() sudoable = True diff --git a/lib/ansible/plugins/shell/sh.py b/lib/ansible/plugins/shell/sh.py index 3b446837761..835a27cae65 100644 --- a/lib/ansible/plugins/shell/sh.py +++ b/lib/ansible/plugins/shell/sh.py @@ -134,12 +134,14 @@ class ShellModule(object): cmd = "%s; %s || (echo \'0 \'%s)" % (test, cmd, shell_escaped_path) return cmd - def build_module_command(self, env_string, shebang, cmd, rm_tmp=None): + def build_module_command(self, env_string, shebang, cmd, arg_path=None, rm_tmp=None): # don't quote the cmd if it's an empty string, because this will # break pipelining mode if cmd.strip() != '': cmd = pipes.quote(cmd) cmd_parts = [env_string.strip(), shebang.replace("#!", "").strip(), cmd] + if arg_path is not None: + cmd_parts.append(arg_path) new_cmd = " ".join(cmd_parts) if rm_tmp: new_cmd = '%s; rm -rf "%s" %s' % (new_cmd, rm_tmp, self._SHELL_REDIRECT_ALLNULL)