From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Feb 2020 23:17:22 +0000 (-0600)
Subject: cephadm: pull: strip newline from version string
X-Git-Tag: v15.1.1~340^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33446%2Fhead;p=ceph.git

cephadm: pull: strip newline from version string

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 49ea389939d9..53a1028200fd 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1637,7 +1637,7 @@ def command_inspect_image():
     if ret:
         return errno.ENOENT
     image_id = normalize_container_id(out.strip())
-    ver = CephContainer(args.image, 'ceph', ['--version']).run()
+    ver = CephContainer(args.image, 'ceph', ['--version']).run().strip()
     r = {
         'image_id': image_id,
         'ceph_version': ver,