From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Nov 2019 21:36:49 +0000 (-0600)
Subject: ceph-daemon: the 'ceph' command may not be installed
X-Git-Tag: v15.1.0~972^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31499%2Fhead;p=ceph.git

ceph-daemon: the 'ceph' command may not be installed

...even though there are legacy data dirs in /var/lib/ceph.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 12880395985e..297d966b643d 100755
--- a/src/ceph-daemon/ceph-daemon
+++ b/src/ceph-daemon/ceph-daemon
@@ -1305,9 +1305,12 @@ def list_daemons():
                     (enabled, state) = check_unit('ceph-%s@%s' % (daemon_type,
                                                                   daemon_id))
                     if not host_version:
-                        out, err, code = call(['ceph', '-v'])
-                        if not code and out.startswith('ceph version '):
-                            host_version = out.split(' ')[2]
+                        try:
+                            out, err, code = call(['ceph', '-v'])
+                            if not code and out.startswith('ceph version '):
+                                host_version = out.split(' ')[2]
+                        except Exception:
+                            pass
 
                     ls.append({
                         'style': 'legacy',