From: Tatjana Dehler <tdehler@suse.com>
Date: Wed, 14 Sep 2022 14:36:16 +0000 (+0200)
Subject: cephadm: consider stdout to get container version
X-Git-Tag: v18.1.0~1132^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F48118%2Fhead;p=ceph.git

cephadm: consider stdout to get container version

Fixes: https://tracker.ceph.com/issues/57558
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 25c18553ab17..5a56544ac006 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -631,10 +631,11 @@ class Monitoring(object):
         cmd = daemon_type.replace('-', '_')
         code = -1
         err = ''
+        out = ''
         version = ''
         if daemon_type == 'alertmanager':
             for cmd in ['alertmanager', 'prometheus-alertmanager']:
-                _, err, code = call(ctx, [
+                out, err, code = call(ctx, [
                     ctx.container_engine.path, 'exec', container_id, cmd,
                     '--version'
                 ], verbosity=CallVerbosity.QUIET)
@@ -642,12 +643,14 @@ class Monitoring(object):
                     break
             cmd = 'alertmanager'  # reset cmd for version extraction
         else:
-            _, err, code = call(ctx, [
+            out, err, code = call(ctx, [
                 ctx.container_engine.path, 'exec', container_id, cmd, '--version'
             ], verbosity=CallVerbosity.QUIET)
-        if code == 0 and \
-                err.startswith('%s, version ' % cmd):
-            version = err.split(' ')[2]
+        if code == 0:
+            if err.startswith('%s, version ' % cmd):
+                version = err.split(' ')[2]
+            elif out.startswith('%s, version ' % cmd):
+                version = out.split(' ')[2]
         return version
 
 ##################################