From e4c24f3407eb035c79fc64065fd5274d787aa6d5 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Tue, 7 Apr 2020 17:20:35 +0530 Subject: [PATCH] library/ceph_volume: look for error messages in stderr Error message were moved to from stdout in stderr here - https://github.com/ceph/ceph/commit/b8d6dcbe9f803c96c0af68da54f1262e9b6a9e77#diff-20f7c578a4e69ec61a5869d706567a24R137. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1793542 Signed-off-by: Rishabh Dave (cherry picked from commit 4249d1e02d6da07466a4ddf1282cf4600a131773) --- library/ceph_volume.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/library/ceph_volume.py b/library/ceph_volume.py index 6b3f7016a..3634a59ff 100644 --- a/library/ceph_volume.py +++ b/library/ceph_volume.py @@ -638,10 +638,17 @@ def run_module(): try: report_result = json.loads(out) except ValueError: - strategy_change = "strategy changed" in out - if strategy_change: - out = json.dumps( - {"changed": False, "stdout": out.rstrip("\r\n")}) + strategy_changed_in_out = "strategy changed" in out + strategy_changed_in_err = "strategy changed" in err + strategy_changed = strategy_changed_in_out or \ + strategy_changed_in_err + if strategy_changed: + if strategy_changed_in_out: + out = json.dumps({"changed": False, + "stdout": out.rstrip("\r\n")}) + elif strategy_changed_in_err: + out = json.dumps({"changed": False, + "stderr": err.rstrip("\r\n")}) rc = 0 changed = False else: @@ -653,7 +660,7 @@ def run_module(): rc=rc, changed=changed, ) - if strategy_change: + if strategy_changed: module.exit_json(**result) module.fail_json(msg='non-zero return code', **result)