From 054e8d8d2820e63dc6be2d39bfaecde895acb1f7 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowak <jnowak@mirantis.com>
Date: Thu, 11 Feb 2016 13:48:31 +0100
Subject: [PATCH] Ansible returns error on stdout

when error SolarTransportResult.output is stderr only if not empty, otherwise stdout

Change-Id: Idc793a6a0c0de33295ef5a8f8c72cb4484b2d9bb
Related-bug: #1544506
---
 solar/core/transports/base.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/solar/core/transports/base.py b/solar/core/transports/base.py
index 2e54bce6..395703b4 100644
--- a/solar/core/transports/base.py
+++ b/solar/core/transports/base.py
@@ -81,7 +81,10 @@ class SolarTransportResult(object):
     def output(self):
         if self.success:
             return self.stdout
-        return self.stderr
+        msg = self.stderr
+        if not msg:
+            msg = self.stdout
+        return msg
 
     @classmethod
     def from_tuple(cls, return_code, stdout, stderr):