openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use exec when spawning any neutron sidecar container"

This commit is contained in:
Zuul 2020-04-03 18:06:16 +00:00 committed by Gerrit Code Review
parent 95a7886ba1 5b799136fa
commit de2057de29
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

@ -333,9 +333,9 @@ outputs:
- name: dhcp_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:

10
deployment/neutron/neutron-l3-container-puppet.yaml
View File

@ -266,20 +266,20 @@ outputs:
loop_var: l3_wrapper_item
loop:
- name: l3_keepalived
cmd: /usr/sbin/keepalived -n -l -D
cmd: exec /usr/sbin/keepalived -n -l -D
kill_script: keepalived-kill
- name: l3_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
- name: l3_dibbler
cmd: /usr/sbin/dibbler-client run
cmd: exec /usr/sbin/dibbler-client run
kill_script: dibbler-kill
- name: l3_radvd
cmd: /usr/sbin/radvd -n
cmd: exec /usr/sbin/radvd -n
kill_script: radvd-kill
docker_config:
step_4: