]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cephadm: use None (not '<no value>') for monitoring daemon version
authorSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 22:34:08 +0000 (16:34 -0600)
committerSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 22:34:08 +0000 (16:34 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/cephadm/cephadm

index 4b51eb4c7ff44f3bb6a48b4b3ab129960b299bbf..57596502479fb2697bec1529b36219bfe06cf799 100755 (executable)
@@ -2427,9 +2427,9 @@ def list_daemons(detail=True, legacy_dir=None):
                             image_id = normalize_container_id(image_id)
                             daemon_type = name.split('.', 1)[0]
                             start_stamp = try_convert_datetime(start)
+                            if not version or '.' not in version:
+                                version = seen_versions.get(image_id, None)
                             if daemon_type in Ceph.daemons:
-                                if not version or '.' not in version:
-                                    version = seen_versions.get(image_id, None)
                                 if not version:
                                     out, err, code = call(
                                         [container_path, 'exec', container_id,