openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Prevent neutron-l3-agent restart killing metadata service 

The existing handler which prevents keepalived from being killed
during neutron-l3-agent restarts doesn't go far enough at present.

This patch adjusts the processes which are killed to exclude the
haproxy instance which is responsible for proxying the Nova
metadata service.

Change-Id: I407c6662841bec9d3e3208d2e46bd7d1d5db00fb
This commit is contained in:
Andrew Bonney 2021-02-12 11:56:57 +00:00 committed by Dmitriy Rabotyagov
parent 5ce6fa9daf
commit 7eb2020f7f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handlers/main.yml
View File

@ -58,7 +58,7 @@
- name: Run neutron-l3-agent process cleanup
shell: |
for ns_pid in $(cat /sys/fs/cgroup/pids/neutron.slice/neutron-l3-agent.service/cgroup.procs); do
echo $(readlink -f "/proc/$ns_pid/exe") | grep -qv "keepalived"
echo $(readlink -f "/proc/$ns_pid/exe") | egrep -qv "keepalived|haproxy"
if [ $? -eq 0 ] || [ "{{ neutron_l3_cleanup_on_shutdown | bool }}" = "True" ]; then
if kill -9 "$ns_pid"; then
logger -s "old neutron-l3-agent pid found and has been cleaned up on: \"$ns_pid\""