]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-daemon: the 'ceph' command may not be installed 31499/head
authorSage Weil <sage@redhat.com>
Fri, 8 Nov 2019 21:36:49 +0000 (15:36 -0600)
committerSage Weil <sage@redhat.com>
Sat, 9 Nov 2019 03:14:36 +0000 (21:14 -0600)
...even though there are legacy data dirs in /var/lib/ceph.

Signed-off-by: Sage Weil <sage@redhat.com>
src/ceph-daemon/ceph-daemon

index 12880395985eeb71f2afaa221ec917a87fe7c541..297d966b643d740c56da69c561e031043f2f1c47 100755 (executable)
@@ -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',