From: Sage Weil <sage@redhat.com>
Date: Wed, 22 Jan 2020 22:46:17 +0000 (-0600)
Subject: cephadm: normalize image_id in 'pull' output too
X-Git-Tag: v15.1.0~92^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0049916a1ae45ebb76fc67e3db37201ccfce1e8;p=ceph.git

cephadm: normalize image_id in 'pull' output too

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index df53bb5364f6..03b551490bc1 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1546,9 +1546,10 @@ def command_pull():
         '--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': out.strip(),
+        'image_id': image_id,
         }, indent=4, sort_keys=True))