From: Sage Weil <sage@newdream.net>
Date: Wed, 24 Mar 2021 16:25:08 +0000 (-0400)
Subject: cephadm: fix parsing of keepalived version (drop leading 'v')
X-Git-Tag: v16.2.0~5^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0922f512cb158aec07bfcea8338a295a6417de3e;p=ceph.git

cephadm: fix parsing of keepalived version (drop leading 'v')

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit f33bf0647bab441993777827903bf046c1c3d80a)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 6ae22410d6ef..ed01cbfd7945 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4754,6 +4754,8 @@ def list_daemons(ctx, detail=True, legacy_dir=None):
                                     if not code and \
                                        err.startswith('Keepalived '):
                                         version = err.split(' ')[1]
+                                        if version[0] == 'v':
+                                            version = version[1:]
                                         seen_versions[image_id] = version
                                 elif daemon_type == CustomContainer.daemon_type:
                                     # Because a custom container can contain