diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 b/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 index 311fe3d00..b06ff4828 100644 --- a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 +++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 @@ -17,13 +17,13 @@ SIG=$1 PID=$2 NETNS=$(ip netns identify ${PID}) -if [ "x${NETNS}" == "x" ]; then - add_date "No network namespace detected, exiting" - exit 1 -fi - {% if tripleo_systemd_wrapper_container_cli == 'podman' %} -CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" +if [ "x${NETNS}" == "x" ]; then + CLI="podman" + SIG=9 +else + CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" +fi {% elif tripleo_systemd_wrapper_container_cli == 'docker' %} {% if tripleo_systemd_wrapper_docker_additional_sockets and tripleo_systemd_wrapper_docker_additional_sockets|length > 0-%} export DOCKER_HOST=unix://{{ tripleo_systemd_wrapper_docker_additional_sockets[0] }}