From: Michael Fritch <mfritch@suse.com>
Date: Thu, 11 Jun 2020 21:03:25 +0000 (-0600)
Subject: cephadm: strip whitespace from iscsi version
X-Git-Tag: v15.2.5~147^2~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe4bc7d9e70a7ee7959f8a6758f16180280d1488;p=ceph.git

cephadm: strip whitespace from iscsi version

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f23649cb5412735e37f3775ebb086f1dc6c7d235)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 8f25d9ae66d..0e16fd29fa5 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -392,7 +392,7 @@ class CephIscsi(object):
             [container_path, 'exec', container_id,
              '/usr/bin/python3', '-c', "import pkg_resources; print(pkg_resources.require('ceph_iscsi')[0].version)"])
         if code == 0:
-            version = out
+            version = out.strip()
         return version
 
     def validate(self):