From 0ef97cd91730b2bafdda33b076b029484d4eb4fe Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Sun, 23 Dec 2012 01:44:00 +0100 Subject: [PATCH] Add return code and error output to raw module Since we use 'raw' heavily on equipment where 'command' and 'shell' are not (yet) working (and python may need to be installed first using raw) these improvements are necessary in order to write more complex scripts (with return code handling and separated stdout/stderr). This change includes the following changes: - exec_command() now returns the return code of the command - _low_level_exec_command() now returns a dict, including 'rc', 'stdout' and 'stderr' - all users of the above interfaces have been improved to make use of the above changes - all connection plugins have been modified to return rc and stderr - fix the newline problem (stdout and stderr would have excess newlines) In a future commit I intend to add assertions or error handling code to verify the return code in those places where it wasn't done. Since only the output was available, the return code was ignored, even though we expect them to be 0. --- fireball | 2 +- raw | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fireball b/fireball index 16f3f580514..88248d6b001 100644 --- a/fireball +++ b/fireball @@ -159,7 +159,7 @@ def command(data): stderr = '' log("got stdout: %s" % stdout) - return dict(stdout=stdout, stderr=stderr) + return dict(rc=p.returncode, stdout=stdout, stderr=stderr) def fetch(data): if 'in_path' not in data: diff --git a/raw b/raw index 1b46f2f886f..061d8eb066a 100644 --- a/raw +++ b/raw @@ -13,11 +13,11 @@ description: all core modules require it. Another is speaking to any devices such as routers that do not have any Python installed. In any other case, using the M(shell) or M(command) module is much more appropriate. Arguments - given to M(raw) are run directly through the configured remote shell and - only output is returned. There is no error detection or change handler - support for this module + given to M(raw) are run directly through the configured remote shell. + Standard output, error output and return code are returned when + available. There is no change handler support for this module. examples: - - code: ansible newhost.example.com -m raw -a "yum -y install python-simplejson" - description: Example from C(/usr/bin/ansible) to bootstrap a legacy python 2.4 host + - description: Example from C(/usr/bin/ansible) to bootstrap a legacy python 2.4 host + code: ansible newhost.example.com -m raw -a "yum -y install python-simplejson" author: Michael DeHaan '''