Commit 34cf0e53 authored by Rishabh Dave's avatar Rishabh Dave Committed by Dimitri Savineau
Browse files

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: default avatarRishabh Dave <ridave@redhat.com>
(cherry picked from commit 4249d1e0)
parent 65b0e9bb
......@@ -590,9 +590,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:
......@@ -604,7 +612,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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment