From 646192989d45ce1c0299a814edae3c418d860b59 Mon Sep 17 00:00:00 2001 From: Davi Frossard Date: Wed, 31 Aug 2022 13:47:19 -0400 Subject: [PATCH] Remove sm-watchdog residues Due to the changes https://opendev.org/starlingx/ha/commit/bd9e560d4bed07b4f4f83ce8d5af3f1975c6a07a which removed the sm-watchdog, we also need to remove residues in kickstart config. Story: 2010087 Task: 46007 Signed-off-by: Davi Frossard Change-Id: I17911773ec4db1549df32a77acd43cd4615b28ee --- kickstart/files/kickstart.cfg | 2 -- mtce/src/pmon/scripts/pmon-test.sh | 1 - 2 files changed, 3 deletions(-) diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg index 84d3b543..c08ce556 100644 --- a/kickstart/files/kickstart.cfg +++ b/kickstart/files/kickstart.cfg @@ -2385,14 +2385,12 @@ if [ ! "${controller}" = true -a "${worker}" = true ] ; then rm ${IMAGE_ROOTFS}/etc/pmon.d/fm-api.conf rm ${IMAGE_ROOTFS}/etc/pmon.d/sm-api.conf rm ${IMAGE_ROOTFS}/etc/pmon.d/sm.conf - rm ${IMAGE_ROOTFS}/etc/pmon.d/sm-watchdog.conf rm ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-controller-daemon.conf ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/hbsAgent.conf ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/fm-api.conf ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/sm-api.conf ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/sm.conf - ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/sm-watchdog.conf ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-controller-daemon.conf fi diff --git a/mtce/src/pmon/scripts/pmon-test.sh b/mtce/src/pmon/scripts/pmon-test.sh index 374384a0..fda08a70 100755 --- a/mtce/src/pmon/scripts/pmon-test.sh +++ b/mtce/src/pmon/scripts/pmon-test.sh @@ -42,7 +42,6 @@ # sm-api restart PASSED [8896]:[8460] # skipping 'sm' process # sm-eru restart PASSED [8904]:[10993] -# sm-watchdog restart PASSED [8695]:[14621] # skipping 'sshd' process # sw-patch-agent restart PASSED [2740]:[17461] # sw-patch-controller-daemon restart PASSED [2558]:[21336]