openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use exec when spawning any neutron sidecar container" into stable/train

This commit is contained in:
Zuul 2020-04-07 18:12:34 +00:00 committed by Gerrit Code Review
parent 6fd448b9b4 cd29180c34
commit 98945f6424
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

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

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

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