Use exec when spawning any neutron sidecar container
Similarly to dnsmasq [0], other processes can receive SIGHUP. This is
allowed by rootwrap filters for all processes [1], and I found some
examples when running neutron-tempest-plugin tests checking
l3-agent.log files:
Running command (rootwrap daemon): ['radvd-kill', 'HUP', '712810'] execute_rootwrap_daemon /usr/lib/python3.6/site-packages/neutron/agent/linux/utils.py:103
Running command (rootwrap daemon): ['keepalived-kill', 'HUP', '402009'] execute_rootwrap_daemon /usr/lib/python3.6/site-packages/neutron/agent/linux/utils.py:103
To prevent additional similar issues, apply similar fix for these
sidecar containers too
Related-Bug: #1867192
[0] I1af2ecd9e3996de4f43224f66a8bdb81eab07022
[1] https://opendev.org/openstack/neutron/src/branch/master/etc/neutron/rootwrap.d
Change-Id: I31237d21527a2909a1669cb6c80cc0fa9be798a6
(cherry picked from commit 5b799136fa
)
This commit is contained in:
parent
76488564e7
commit
cd29180c34
|
@ -338,9 +338,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:
|
||||
|
|
|
@ -286,20 +286,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:
|
||||
|
|
Loading…
Reference in New Issue