From 0c88c8898d44f9608ca33b8699b5c70bb5124f3b Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 17 Mar 2020 11:17:48 +0100 Subject: [PATCH] Use exec for ovn metadata agent Let's use exec also for the ovn metadata agent. This was already done in the same vein via I31237d21527a2909a1669cb6c80cc0fa9be798a6 I1af2ecd9e3996de4f43224f66a8bdb81eab07022 for dnsmasq and other neutron sidecar containers. In this case it does not fix anything specifically bit it avoids a spurious bash process on the system so it makes sense nonetheless. Related-Bug: #1867192 Change-Id: If4b9c38e8cd2c531cbc984f6f79fb79111204b25 --- deployment/ovn/ovn-metadata-container-puppet.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 8babeff4e6..fe3db5fb28 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-puppet.yaml @@ -272,9 +272,9 @@ outputs: - name: ovn_metadata_haproxy cmd: >- $(if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then - echo "/usr/sbin/haproxy -Ds"; + echo "exec /usr/sbin/haproxy -Ds"; else - echo "/usr/sbin/haproxy -Ws"; fi) + echo "exec /usr/sbin/haproxy -Ws"; fi) kill_script: haproxy-kill docker_config: step_4: