From: Sage Weil Date: Sat, 7 Mar 2020 22:34:08 +0000 (-0600) Subject: cephadm: use None (not '') for monitoring daemon version X-Git-Tag: v15.1.1~66^2~3 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6ef96b48816e4002975d0a0537ba033d5520dbd2;p=ceph-ci.git cephadm: use None (not '') for monitoring daemon version Signed-off-by: Sage Weil --- diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 4b51eb4c7ff..57596502479 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -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,