From 7436ec965fa88250a338108404a6b66cf59915fc Mon Sep 17 00:00:00 2001 From: Jagatguru Prasad Mishra Date: Wed, 13 Dec 2023 14:13:51 -0500 Subject: [PATCH] Copy luks.conf to '/etc/pmon.d' luks.conf contains the configurations used by pmon to monitor luks-fs-mgr service.This change links /usr/share/starlingx/pmon.d to /etc/pmon.d. Once this is done, pmon starts monitoring the process, creates and clears an alarm, tries to restart the service, degrades the host in case of multiple failures. Test Plan: PASS: build-pkgs -c -p platform-kickstarts PASS: build-image PASS: AIO-SX verify if luks.conf is present at /etc/pmon.d PASS: AIO-DX verify if luks.conf is present at /etc/pmon.d PASS: AIO-DX alarm should be created if pmon is unable to start the service PASS: AIO-DX pmon.log should contain error messages if service is down. PASS: Standard: Pmon monitoring should not be enable on compute and storage nodes. Ensure conf file is not present at '/etc/pmon.d' on compute and storage hosts. On controller hosts this file should be present at /etc/pmon.d'. PASS: AIO-DX alarm should be cleared and host availability should be 'available' once service starts running. PASS: AIO-DX is service is unrecoverable, host is reported to host watchdog. Story: 2010872 Task: 49250 Depends-On: https://review.opendev.org/c/starlingx/integ/+/903612 Change-Id: I4eeb4b2f79b1bb017a0fe2af34f35854c89dee82 Signed-off-by: Jagatguru Prasad Mishra --- kickstart/files/kickstart.cfg | 1 + kickstart/files/miniboot.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg index 70108fc9..d3f2deac 100644 --- a/kickstart/files/kickstart.cfg +++ b/kickstart/files/kickstart.cfg @@ -3162,6 +3162,7 @@ if [ "${controller}" = true ] ; then ln -s /usr/share/starlingx/pmon.d/sw-patch-controller-daemon.conf ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-controller-daemon.conf ln -s /usr/share/starlingx/pmon.d/sysinv-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/sysinv-agent.conf ln -s /usr/share/starlingx/pmon.d/syslog-ng.conf ${IMAGE_ROOTFS}/etc/pmon.d/syslog-ng.conf + ln -s /usr/share/starlingx/pmon.d/luks.conf ${IMAGE_ROOTFS}/etc/pmon.d/luks.conf fi if [ "${worker}" = true ] ; then ilog "Setting up pmon files for ${TRAIT__WORKER} and/or ${TRAIT__WORKER} side of ${SYSTEM_TYPE__AIO}" diff --git a/kickstart/files/miniboot.cfg b/kickstart/files/miniboot.cfg index 35ec2781..974a7f02 100644 --- a/kickstart/files/miniboot.cfg +++ b/kickstart/files/miniboot.cfg @@ -3126,6 +3126,7 @@ if [ "${controller}" = true ] ; then ln -s /usr/share/starlingx/pmon.d/sw-patch-controller-daemon.conf ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-controller-daemon.conf ln -s /usr/share/starlingx/pmon.d/sysinv-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/sysinv-agent.conf ln -s /usr/share/starlingx/pmon.d/syslog-ng.conf ${IMAGE_ROOTFS}/etc/pmon.d/syslog-ng.conf + ln -s /usr/share/starlingx/pmon.d/luks.conf ${IMAGE_ROOTFS}/etc/pmon.d/luks.conf fi if [ "${worker}" = true ] ; then ilog "Setting up pmon files for ${TRAIT__WORKER} and/or ${TRAIT__WORKER} side of ${SYSTEM_TYPE__AIO}"