]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix parsing of keepalived version (drop leading 'v')
authorSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 16:25:08 +0000 (12:25 -0400)
committerSage Weil <sage@newdream.net>
Fri, 26 Mar 2021 12:33:19 +0000 (07:33 -0500)
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit f33bf0647bab441993777827903bf046c1c3d80a)

src/cephadm/cephadm

index 6ae22410d6ef23741257ff4f4cdd1c45edd28b1b..ed01cbfd7945082121834a54a1776b4e0954398a 100755 (executable)
@@ -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