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 8133a8db81bd49a38c415688ca667c3b58403f7d..36f2e9adebcbb0e1c992b47390e26b3371990b56 100755 (executable)
--- 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':