From fc7911e95d5514909832dd3df64a3df286e35733 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 28 Sep 2023 11:07:21 -0400 Subject: [PATCH] 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 (cherry picked from commit 5540cd1882faaf67013771bf18291053dcf2164d) --- src/cephadm/cephadm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 8133a8db81bd4..36f2e9adebcbb 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': -- 2.39.5