From 19952c7de31ac311ea8a5d8d83e66834595844a5 Mon Sep 17 00:00:00 2001
From: Lin Shuicheng <shuicheng.lin@intel.com>
Date: Sun, 19 Jan 2020 02:00:30 +0000
Subject: [PATCH] Revert "Revert "Add containerd to collect tool""

This reverts commit 44509a38bffea8a3cd47500ad975df2edde50d0e.

Depends-On: https://review.opendev.org/703263
Change-Id: Iec8ebf1daa795cd86b5b7ecc6c9dd93d59e8dab3
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
 tools/collector/scripts/collect_containerization.sh | 8 ++++++++
 tools/collector/scripts/run.exclude                 | 1 +
 2 files changed, 9 insertions(+)

diff --git a/tools/collector/scripts/collect_containerization.sh b/tools/collector/scripts/collect_containerization.sh
index d2e5a924..a26fef15 100755
--- a/tools/collector/scripts/collect_containerization.sh
+++ b/tools/collector/scripts/collect_containerization.sh
@@ -29,10 +29,18 @@ 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 b1c1794c..d3e6d8b9 100644
--- a/tools/collector/scripts/run.exclude
+++ b/tools/collector/scripts/run.exclude
@@ -10,3 +10,4 @@
 /var/run/avahi-daemon
 /var/run/neutron/metadata_proxy
 /var/run/.vswitch
+/var/run/containerd