From 44509a38bffea8a3cd47500ad975df2edde50d0e Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 14 Jan 2020 20:38:04 +0000
Subject: [PATCH] Revert "Add containerd to collect tool"

This reverts commit dc451b07c65527e1132b781ef942c95e7271f5eb.

Reverting due to https://bugs.launchpad.net/starlingx/+bug/1859686

Change-Id: Ica69e923a734c7bc02a521caa3e91eff57047568
---
 tools/collector/scripts/collect_containerization.sh | 8 --------
 tools/collector/scripts/run.exclude                 | 1 -
 2 files changed, 9 deletions(-)

diff --git a/tools/collector/scripts/collect_containerization.sh b/tools/collector/scripts/collect_containerization.sh
index a26fef15..d2e5a924 100755
--- a/tools/collector/scripts/collect_containerization.sh
+++ b/tools/collector/scripts/collect_containerization.sh
@@ -29,18 +29,10 @@ CMD="docker image ls -a"
 delimiter ${LOGFILE} "${CMD}"
 ${CMD} 2>>${COLLECT_ERROR_LOG} >>${LOGFILE}
 
-CMD="crictl images"
-delimiter ${LOGFILE} "${CMD}"
-${CMD} 2>>${COLLECT_ERROR_LOG} >>${LOGFILE}
-
 CMD="docker container ps -a"
 delimiter ${LOGFILE} "${CMD}"
 ${CMD} 2>>${COLLECT_ERROR_LOG} >>${LOGFILE}
 
-CMD="crictl ps -a"
-delimiter ${LOGFILE} "${CMD}"
-${CMD} 2>>${COLLECT_ERROR_LOG} >>${LOGFILE}
-
 ###############################################################################
 # Active Controller
 ###############################################################################
diff --git a/tools/collector/scripts/run.exclude b/tools/collector/scripts/run.exclude
index d3e6d8b9..b1c1794c 100644
--- a/tools/collector/scripts/run.exclude
+++ b/tools/collector/scripts/run.exclude
@@ -10,4 +10,3 @@
 /var/run/avahi-daemon
 /var/run/neutron/metadata_proxy
 /var/run/.vswitch
-/var/run/containerd