aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2024-01-09 15:34:12 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2024-05-14 10:56:31 +0000
commitf1331fa8875678377dd2c54e58d3cbe8d2aec45f (patch)
tree1f68b2cd83b4400568b9cabd3b25198b698a4a8d /ansible
parentcff75f6eacf2723877cfd8e32993bfec9acd42d2 (diff)
downloadkolla-ansible-f1331fa8875678377dd2c54e58d3cbe8d2aec45f.tar.gz
kolla-ansible-f1331fa8875678377dd2c54e58d3cbe8d2aec45f.zip
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
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/loadbalancer/templates/haproxy/haproxy_run.sh.j24
1 files changed, 1 insertions, 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 692b39e0e..7d3492c08 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/