From 9041619366429beac4ce9ff59099b0e56392e1ab Mon Sep 17 00:00:00 2001
From: Marius Cornea <mcornea@redhat.com>
Date: Fri, 22 Jun 2018 11:44:35 -0400
Subject: [PATCH] Filter qrouter containers from images validation script

Post minor update the Neutron qrouter containers do not get updated
to the latest images to avoid router failovers. This change adjusts
the images validation script to filter out the qrouter containers
and allow the validation to pass.

Change-Id: I1f31d2b6783a1c7e264e85a7ed3fb3df4b71a9a0
(cherry picked from commit be343de4e01ca92af483029f4ebf9d89f1110fc9)
---
 templates/validate_docker_images_versions.sh.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/validate_docker_images_versions.sh.j2 b/templates/validate_docker_images_versions.sh.j2
index 35381618..16ab040e 100644
--- a/templates/validate_docker_images_versions.sh.j2
+++ b/templates/validate_docker_images_versions.sh.j2
@@ -41,7 +41,7 @@ for _ip in $( openstack server list -f value -c Networks | awk -F '=' '{ print $
     echo "================================================================================"
     CONTAINERS=$( ssh -q -o StrictHostKeyChecking=no \
                     {% if overcloud_ssh_user != '' %}{{overcloud_ssh_user}}{% else %}heat-admin{% endif %}@${_ip} \
-                    "sudo docker ps 2>&1 | grep -v -e pcmk -e ID | awk '{ print \$2 }'" )
+                    "sudo docker ps 2>&1 | grep -v -e pcmk -e ID -e qrouter | awk '{ print \$2 }'" )
     for _container in ${CONTAINERS} ; do
         # non pcs managed containers
         assert_image_in_file {{ working_dir}}/{{ container_registry_file }} ${_container}