From 1a54266029b256d451c542be0534fc549bdf72a4 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Thu, 2 Feb 2017 09:49:12 +0000
Subject: [PATCH] Ignore qemu-img process in cleanup-containers
Change-Id: I059b0aafbf93cf8c131beba47ca6f6718ec5fb36
Closes-Bug: #1586548
---
tools/cleanup-containers | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 612b34a620..b48c2fc849 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -2,7 +2,7 @@
containers_running=$(docker ps --filter "label=kolla_version" --format "{{.Names}}")
-QEMU_PIDS=$(pgrep -l qemu | awk '!/qemu-ga/ {print $1}')
+QEMU_PIDS=$(pgrep -l qemu | awk '!/qemu-ga/ && !/qemu-img/ {print $1}')
if [[ "${containers_running}" =~ "nova_libvirt" ]] && [[ $QEMU_PIDS ]] && [[ $(ps --no-headers wwwup $QEMU_PIDS | grep --invert-match '\-xen\-domid 0') ]]; then
echo "Some qemu processes were detected."
echo "Docker will not be able to stop the nova_libvirt container with those running."