openstack/tripleo-ansible
Code Issues Proposed changes

Using podman/docker ps to look for running sidecars

Browse Source 
We've been running into numerous issues with searching on patterns in
the command so using the container CLI to match seems better.

Change-Id: I13633ab4d5ebfc7f52b7215523c310fe72a5487e
Closes-Bug: #1869384
This commit is contained in:
Brent Eagles 2020-03-27 14:39:12 -02:30
parent 92b0f84876
commit b187fb5b62
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_sync.j2
View File

@ -6,7 +6,8 @@ set -x
function start_service { function start_service {
local NETNS=$1 local NETNS=$1
shift shift
local NAME="{{ tripleo_systemd_wrapper_service_name }}-${NETNS}" local NAME=$1
shift
local CLI='{{ tripleo_systemd_wrapper_container_cli }}' local CLI='{{ tripleo_systemd_wrapper_container_cli }}'
local CMD="{{ tripleo_systemd_wrapper_service_dir }}/{{ tripleo_systemd_wrapper_service_name }}/command" local CMD="{{ tripleo_systemd_wrapper_service_dir }}/{{ tripleo_systemd_wrapper_service_name }}/command"
local CONTAINER_CMD="ip netns exec ${NETNS} ${CMD}" local CONTAINER_CMD="ip netns exec ${NETNS} ${CMD}"
@ -39,10 +40,26 @@ flock "$lock_fd"
IFS=$'\n' IFS=$'\n'
for LINE in $(cat {{ tripleo_systemd_wrapper_service_dir }}/{{ tripleo_systemd_wrapper_service_name }}/processes); do for LINE in $(cat {{ tripleo_systemd_wrapper_service_dir }}/{{ tripleo_systemd_wrapper_service_name }}/processes); do
NETNS=$(echo $LINE | awk '{ print $1 }') NETNS=$(echo $LINE | awk '{ print $1 }')
CONTAINER_NAME="{{ tripleo_systemd_wrapper_service_name }}-${NETNS}"
CLI='{{ tripleo_systemd_wrapper_container_cli }}'
# We do a filter to create a short list and then have to exact name match the results. The reason is that
# containers that partially match the filter will show up in the list. This is a little unlikely but there
# is nothing to prevent that.
start_container=yes
container_list=`$CLI ps --format={% raw %}"{{.Names}}"{% endraw %} --filter="name=$CONTAINER_NAME"`
for name in ${container_list};
do
if [ "x$name" = "x$CONTAINER_NAME"];
then
start_container=no
break
fi
done
if [ "$start_container" = "yes" ];
then
IFS=$' ' ARGS=$(echo $LINE | sed -e "s|$NETNS ||" | xargs) IFS=$' ' ARGS=$(echo $LINE | sed -e "s|$NETNS ||" | xargs)
# TODO(emilien) investigate if we should rather run docker/podman ps instead of ps on the host start_service $NETNS $CONTAINER_NAME $ARGS
if ! ps -e -o pid,command | grep "$(echo $NETNS | sed 's|^[^-]*\-||')" | egrep -v "grep | netns exec" &> /dev/null; then
start_service $NETNS $ARGS
fi fi
done done
# truncate the file so we don't start them again # truncate the file so we don't start them again