Merge "Prevent neutron-l3-agent restart killing metadata service"
This commit is contained in:
commit
754a1c0399
@ -58,7 +58,7 @@
|
|||||||
- name: Run neutron-l3-agent process cleanup
|
- name: Run neutron-l3-agent process cleanup
|
||||||
shell: |
|
shell: |
|
||||||
for ns_pid in $(cat /sys/fs/cgroup/pids/neutron.slice/neutron-l3-agent.service/cgroup.procs); do
|
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 [ $? -eq 0 ] || [ "{{ neutron_l3_cleanup_on_shutdown | bool }}" = "True" ]; then
|
||||||
if kill -9 "$ns_pid"; then
|
if kill -9 "$ns_pid"; then
|
||||||
logger -s "old neutron-l3-agent pid found and has been cleaned up on: \"$ns_pid\""
|
logger -s "old neutron-l3-agent pid found and has been cleaned up on: \"$ns_pid\""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user