From f1331fa8875678377dd2c54e58d3cbe8d2aec45f Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 9 Jan 2024 15:34:12 +0100
Subject: [PATCH] haproxy: Use -f configdir instead of for and xargs
-f configdir has been supported in HaProxy since 1.7
Partial-Bug: #2048130
Change-Id: Icb95cb072cb3eb5c27ffd79a127069bfcf21a61a
---
.../roles/loadbalancer/templates/haproxy/haproxy_run.sh.j2 | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/ansible/roles/loadbalancer/templates/haproxy/haproxy_run.sh.j2 b/ansible/roles/loadbalancer/templates/haproxy/haproxy_run.sh.j2
index 692b39e0e3..7d3492c08a 100644
--- a/ansible/roles/loadbalancer/templates/haproxy/haproxy_run.sh.j2
+++ b/ansible/roles/loadbalancer/templates/haproxy/haproxy_run.sh.j2
@@ -35,6 +35,4 @@ fi
{% endif %}
{% endif %}
-find /etc/haproxy/services.d/ -mindepth 1 -print0 | \
- xargs -0 -Icfg echo -f cfg | \
- xargs /usr/sbin/haproxy -W -db -p /run/haproxy.pid -f /etc/haproxy/haproxy.cfg
+exec /usr/sbin/haproxy -W -db -p /run/haproxy.pid -f /etc/haproxy/haproxy.cfg -f /etc/haproxy/services.d/
--
GitLab