From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Jan 2020 14:45:32 +0000 (-0600)
Subject: cephadm: share code between 'pull' and 'inspect-image'
X-Git-Tag: v15.1.1~604^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8debba782cd4f40ed13db7f1af8ef43503ccec5;p=ceph-ci.git

cephadm: share code between 'pull' and 'inspect-image'

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index c91593d4d7c..7f689a3f6d3 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1538,19 +1538,10 @@ def command_version():
 ##################################
 
 def command_pull():
-    # type: () -> None
+    # type: () -> int
     logger.info('Pulling latest %s...' % args.image)
     call_throws([container_path, 'pull', args.image])
-    out, err, ret = call_throws([
-        container_path, 'inspect',
-        '--format', '{{.Id}}',
-        args.image])
-    ver = CephContainer(args.image, 'ceph', ['--version']).run()
-    image_id = normalize_container_id(out.strip())
-    print(json.dumps({
-        'ceph_version': ver.strip(),
-        'image_id': image_id,
-        }, indent=4, sort_keys=True))
+    return command_inspect_image()
 
 ##################################