From 4ae191f23d997b383103b628bbcb1a5b36e6ffb2 Mon Sep 17 00:00:00 2001 From: Kaustubh Dhokte Date: Thu, 4 Jul 2024 00:12:51 +0000 Subject: [PATCH] Collect_containerization: correct etcd conf file path This change corrects etcd config file path in /etc/collect.d/collect_containerization. The file still uses etcd config file path used on centos i.e. /etc/etcd/etcd.conf. The same on Debian (new StarlingX base OS) is /etc/default/etcd. With this correction, now collectd can correctly dump etcd database. Test Plan: AIO-SX: PASS: Run 'collect --all', etcd database dumped correctly under var/extra. Closes-Bug: 2071866 Change-Id: I85be6cdec4f050f1f34df21d772af12305f09f15 Signed-off-by: Kaustubh Dhokte --- tools/collector/scripts/collect_containerization.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/collector/scripts/collect_containerization.sh b/tools/collector/scripts/collect_containerization.sh index 0973bc04..f9c47f17 100755 --- a/tools/collector/scripts/collect_containerization.sh +++ b/tools/collector/scripts/collect_containerization.sh @@ -152,7 +152,7 @@ if [ "$nodetype" = "controller" -a "${ACTIVE}" = true ] ; then delimiter ${LOGFILE} "${CMD}" ${CMD} 2>>${COLLECT_ERROR_LOG} - export $(grep '^ETCD_LISTEN_CLIENT_URLS=' /etc/etcd/etcd.conf | tr -d '"') + export $(grep '^ETCD_LISTEN_CLIENT_URLS=' /etc/default/etcd | tr -d '"') CMD="sudo ETCDCTL_API=3 etcdctl \ --endpoints=$ETCD_LISTEN_CLIENT_URLS get / --prefix"