openstack/tripleo-heat-templates
Code Issues Proposed changes

Use exec for ovn metadata agent

Browse Source 
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
This commit is contained in:
Michele Baldessari 2020-03-17 11:17:48 +01:00
parent 0d03068e83
commit 0c88c8898d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/ovn/ovn-metadata-container-puppet.yaml
View File

@ -272,9 +272,9 @@ outputs:
- name: ovn_metadata_haproxy - name: ovn_metadata_haproxy
cmd: >- cmd: >-
$(if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then $(if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then
echo "/usr/sbin/haproxy -Ds"; echo "exec /usr/sbin/haproxy -Ds";
else else
echo "/usr/sbin/haproxy -Ws"; fi) echo "exec /usr/sbin/haproxy -Ws"; fi)
kill_script: haproxy-kill kill_script: haproxy-kill
docker_config: docker_config:
step_4: step_4: