openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix killscript regex match for libpod-conmon-*" into stable/victoria

This commit is contained in:
Zuul 2022-01-11 04:21:07 +00:00 committed by Gerrit Code Review
parent 5314c792be 50a28df085
commit 7a25af40b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/neutron/kill-script
View File

@ -52,7 +52,7 @@ signal_container() {
{% raw -%} {% raw -%}
if [ -f /proc/$PID/cgroup ]; then if [ -f /proc/$PID/cgroup ]; then
# Get container ID based on process cgroups # Get container ID based on process cgroups
CT_ID=$(awk 'BEGIN {FS="[-.]"} /:pids:/{print $3}' /proc/$PID/cgroup) CT_ID=$(awk 'BEGIN {FS=".scope|-"} /0::|:pids:/ {if ($(NF-1)) print $(NF-1);exit}' /proc/$PID/cgroup)
CT_NAME=$($CLI inspect -f '{{.Name}}' $CT_ID) CT_NAME=$($CLI inspect -f '{{.Name}}' $CT_ID)
case $SIG in case $SIG in