From cf9470bbbf3fc0554b4961909c11a4563d8270aa Mon Sep 17 00:00:00 2001 From: Luis Eduardo Bonatti Date: Mon, 12 Aug 2024 16:25:58 -0300 Subject: [PATCH] Add software-agent under pmon for worker and storage nodes. This commit add software-agent under pmon monitor for storage and worker nodes. Test Plan: PASS: Kill software-agent process, verify it is started by pmon on storage node. PASS: Kill software-agent process, verify it is started by pmon on worker node. PASS: Check pmon.log related to the action above for both nodes. PASS: Verify system install. PASS: Verify pmond logs after a system install don't show that pmond had to start the process. Story: 2010676 Task: 50819 Change-Id: Ia16d774b96f8a793008a6850b6ead7603433625a Signed-off-by: Luis Eduardo Bonatti --- kickstart/files/kickstart.cfg | 2 ++ kickstart/files/miniboot.cfg | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg index 456066b1..bbe535e4 100644 --- a/kickstart/files/kickstart.cfg +++ b/kickstart/files/kickstart.cfg @@ -3359,6 +3359,7 @@ if [ "${worker}" = true ] ; then ln -s /usr/share/starlingx/pmon.d/sw-patch-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-agent.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/software-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/software-agent.conf fi if [ "${storage}" = true ] ; then ilog "Setting up pmon files for ${TRAIT__STORAGE} and/or ${TRAIT__STORAGE} side of ${SYSTEM_TYPE__AIO}" @@ -3378,6 +3379,7 @@ if [ "${storage}" = true ] ; then ln -s /usr/share/starlingx/pmon.d/sw-patch-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-agent.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/software-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/software-agent.conf fi if enable_cloudinit; then diff --git a/kickstart/files/miniboot.cfg b/kickstart/files/miniboot.cfg index 9c5075ed..db37b70e 100644 --- a/kickstart/files/miniboot.cfg +++ b/kickstart/files/miniboot.cfg @@ -3197,6 +3197,7 @@ if [ "${worker}" = true ] ; then ln -s /usr/share/starlingx/pmon.d/sw-patch-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-agent.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/software-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/software-agent.conf fi if [ "${storage}" = true ] ; then ilog "Setting up pmon files for ${TRAIT__STORAGE} and/or ${TRAIT__STORAGE} side of ${SYSTEM_TYPE__AIO}" @@ -3216,6 +3217,7 @@ if [ "${storage}" = true ] ; then ln -s /usr/share/starlingx/pmon.d/sw-patch-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-agent.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/software-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/software-agent.conf fi true