From: Adam King <adking@redhat.com>
Date: Thu, 28 Sep 2023 15:07:21 +0000 (-0400)
Subject: cephadm: fix haproxy version with certain containers
X-Git-Tag: v18.2.1~207^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc7911e95d5514909832dd3df64a3df286e35733;p=ceph.git

cephadm: fix haproxy version with certain containers

Some builds of haproxy containers' output
from "haproxy -v" start with

HAProxy version

rather than

HA-Proxy version

no reason on our end not to accept both

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 5540cd1882faaf67013771bf18291053dcf2164d)
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 8133a8db81b..36f2e9adebc 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -7193,7 +7193,8 @@ def list_daemons(ctx, detail=True, legacy_dir=None):
                                                            'haproxy', '-v'],
                                                           verbosity=CallVerbosity.QUIET)
                                     if not code and \
-                                       out.startswith('HA-Proxy version '):
+                                       out.startswith('HA-Proxy version ') or \
+                                       out.startswith('HAProxy version '):
                                         version = out.split(' ')[2]
                                         seen_versions[image_id] = version
                                 elif daemon_type == 'keepalived':