From 6b319b9dc7b2af9e92a6947352925b46c68f4bcd Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 5 Nov 2019 12:08:33 -0600 Subject: [PATCH] ceph-daemon: include container_image_name and container_image_id in 'ls' output Signed-off-by: Sage Weil --- src/ceph-daemon/ceph-daemon | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon index 380c144cadd60..91929adfa96ba 100755 --- a/src/ceph-daemon/ceph-daemon +++ b/src/ceph-daemon/ceph-daemon @@ -1439,22 +1439,26 @@ def list_daemons(detail=True, legacy_dir=None): # get container id (i['enabled'], i['state']) = check_unit(unit_name) container_id = None + image_name = None + image_id = None version = None out, err, code = call( [ container_path, 'inspect', - '--format', '{{.Id}}', + '--format', '{{.Id}},{{.Config.Image}},{{.Image}}', 'ceph-%s-%s' % (fsid, j) ], verbose_on_failure=False) if not code: - container_id = out.strip()[0:12] + (container_id, image_name, image_id) = out.strip().split(',') out, err, code = call( [container_path, 'exec', container_id, 'ceph', '-v']) if not code and out.startswith('ceph version '): version = out.split(' ')[2] i['container_id'] = container_id + i['container_image_name'] = image_name + i['container_image_id'] = image_id i['version'] = version ls.append(i) -- 2.39.5