From 3df35b03b94062a8ee79ca1f043356e84ad7c0f6 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 11:04:32 -0400 Subject: [PATCH] cephadm: move haproxy daemon args out of _get_daemon_args Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 0d820cb2128..6b25635b791 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2337,9 +2337,6 @@ def _get_daemon_args(ctx: CephadmContext, ident: 'DaemonIdentity') -> List[str]: elif daemon_type == CephExporter.daemon_type: ceph_exporter = CephExporter.init(ctx, ident.fsid, ident.daemon_id) r.extend(ceph_exporter.get_daemon_args()) - elif daemon_type == HAproxy.daemon_type: - haproxy = HAproxy.init(ctx, ident.fsid, ident.daemon_id) - r += haproxy.get_daemon_args() return r @@ -2810,6 +2807,8 @@ def get_container( elif daemon_type == HAproxy.daemon_type: name = ident.daemon_name container_args.extend(['--user=root']) # haproxy 2.4 defaults to a different user + haproxy = HAproxy.init(ctx, ident.fsid, ident.daemon_id) + d_args.extend(haproxy.get_daemon_args()) elif daemon_type == Keepalived.daemon_type: name = ident.daemon_name envs.extend(Keepalived.get_container_envs()) -- 2.39.5