From 0409cfa407fef2675af90edcaa2c0389c7ff36fd Mon Sep 17 00:00:00 2001 From: Dan Voiculeasa Date: Mon, 29 Aug 2022 18:14:23 +0300 Subject: [PATCH] Debian: Proper link pmon conf files for personalities [1/2] Do proper link of pmon conf files for AIO, Standard Controller and Standard Worker personalities. There will be a future commit for Storage personality, integration didn't progress that far yet. Tests: Packaging is updated to provide pmon files in 2 locations. One will be dropped later. Used an artificial rm ${IMAGE_ROOTFS}/etc/pmon.d/* to emulate correct packaging. PASS: Standard 2+2 deployment unlocked/enabled/available PASS: AIO-DX deployment unlocked/enabled/available Added the reviews that change packaging as dependencies. Depends-On: https://review.opendev.org/c/starlingx/fault/+/854298 Depends-On: https://review.opendev.org/c/starlingx/ha/+/854299 Depends-On: https://review.opendev.org/c/starlingx/nfv/+/854301 Depends-On: https://review.opendev.org/c/starlingx/utilities/+/854303 Depends-On: https://review.opendev.org/c/starlingx/update/+/854302 Depends-On: https://review.opendev.org/c/starlingx/config/+/854297 Depends-On: https://review.opendev.org/c/starlingx/config-files/+/854296 Depends-On: https://review.opendev.org/c/starlingx/metal/+/854300 Depends-On: https://review.opendev.org/c/starlingx/integ/+/854304 Story: 2010211 Task: 46149 Signed-off-by: Dan Voiculeasa Change-Id: Iac7bfac5decc5bb5dd6225b31e70c2cc3790793f --- kickstart/files/kickstart.cfg | 69 ++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg index a66700b7..9b006d1e 100644 --- a/kickstart/files/kickstart.cfg +++ b/kickstart/files/kickstart.cfg @@ -2619,23 +2619,6 @@ ilog "******************************************************************" # Launchpad: #1983580 rm ${IMAGE_ROOTFS}/var/lib/dpkg/triggers/Unincorp -if [ ! "${controller}" = true -a "${worker}" = true ] ; then - ilog "Setting up pmon configs for standalone ${TRAIT__WORKER} personality" - ilog "This will be removed when packaging is updated" - - rm ${IMAGE_ROOTFS}/etc/pmon.d/hbsAgent.conf - 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/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/sw-patch-controller-daemon.conf -fi - true %end @@ -2705,5 +2688,57 @@ fi chmod 700 ${IMAGE_ROOTFS}/etc/goenabled.d/config_goenabled_check.sh +if [[ ! -d "${IMAGE_ROOTFS}/etc/pmon.d" ]]; then + wlog "Directory /etc/pmon.d/ is missing, creating it now" + mkdir ${IMAGE_ROOTFS}/etc/pmon.d +fi + +if [ "${controller}" = true ] ; then + ilog "Setting up pmon files for ${TRAIT__CONTROLLER} and/or ${TRAIT__CONTROLLER} side of ${SYSTEM_TYPE__AIO}" + ln -s /usr/share/starlingx/pmon.d/acpid.conf ${IMAGE_ROOTFS}/etc/pmon.d/acpid.conf + ln -s /usr/share/starlingx/pmon.d/containerd.conf ${IMAGE_ROOTFS}/etc/pmon.d/containerd.conf + ln -s /usr/share/starlingx/pmon.d/docker.conf ${IMAGE_ROOTFS}/etc/pmon.d/docker.conf + ln -s /usr/share/starlingx/pmon.d/fm-api.conf ${IMAGE_ROOTFS}/etc/pmon.d/fm-api.conf + ln -s /usr/share/starlingx/pmon.d/fsmon.conf ${IMAGE_ROOTFS}/etc/pmon.d/fsmon.conf + ln -s /usr/share/starlingx/pmon.d/hbsAgent.conf ${IMAGE_ROOTFS}/etc/pmon.d/hbsAgent.conf + ln -s /usr/share/starlingx/pmon.d/hbsClient.conf ${IMAGE_ROOTFS}/etc/pmon.d/hbsClient.conf + ln -s /usr/share/starlingx/pmon.d/lmon.conf ${IMAGE_ROOTFS}/etc/pmon.d/lmon.conf + ln -s /usr/share/starlingx/pmon.d/logmgmt ${IMAGE_ROOTFS}/etc/pmon.d/logmgmt + ln -s /usr/share/starlingx/pmon.d/mtcClient.conf ${IMAGE_ROOTFS}/etc/pmon.d/mtcClient.conf + ln -s /usr/share/starlingx/pmon.d/mtcalarm.conf ${IMAGE_ROOTFS}/etc/pmon.d/mtcalarm.conf + ln -s /usr/share/starlingx/pmon.d/mtclogd.conf ${IMAGE_ROOTFS}/etc/pmon.d/mtclogd.conf + ln -s /usr/share/starlingx/pmon.d/sm-api.conf ${IMAGE_ROOTFS}/etc/pmon.d/sm-api.conf + ln -s /usr/share/starlingx/pmon.d/sm-eru.conf ${IMAGE_ROOTFS}/etc/pmon.d/sm-eru.conf + ln -s /usr/share/starlingx/pmon.d/sm.conf ${IMAGE_ROOTFS}/etc/pmon.d/sm.conf + ln -s /usr/share/starlingx/pmon.d/sshd.conf ${IMAGE_ROOTFS}/etc/pmon.d/sshd.conf + ln -s /usr/share/starlingx/pmon.d/sssd.conf ${IMAGE_ROOTFS}/etc/pmon.d/sssd.conf + 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/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 +fi +if [ "${worker}" = true ] ; then + ilog "Setting up pmon files for ${TRAIT__WORKER} and/or ${TRAIT__WORKER} side of ${SYSTEM_TYPE__AIO}" + ln -s /usr/share/starlingx/pmon.d/acpid.conf ${IMAGE_ROOTFS}/etc/pmon.d/acpid.conf + ln -s /usr/share/starlingx/pmon.d/containerd.conf ${IMAGE_ROOTFS}/etc/pmon.d/containerd.conf + ln -s /usr/share/starlingx/pmon.d/docker.conf ${IMAGE_ROOTFS}/etc/pmon.d/docker.conf + ln -s /usr/share/starlingx/pmon.d/fsmon.conf ${IMAGE_ROOTFS}/etc/pmon.d/fsmon.conf + ln -s /usr/share/starlingx/pmon.d/guestServer.conf ${IMAGE_ROOTFS}/etc/pmon.d/guestServer.conf + ln -s /usr/share/starlingx/pmon.d/hbsClient.conf ${IMAGE_ROOTFS}/etc/pmon.d/hbsClient.conf + ln -s /usr/share/starlingx/pmon.d/isolcpu_plugin.conf ${IMAGE_ROOTFS}/etc/pmon.d/isolcpu_plugin.conf + ln -s /usr/share/starlingx/pmon.d/lmon.conf ${IMAGE_ROOTFS}/etc/pmon.d/lmon.conf + ln -s /usr/share/starlingx/pmon.d/logmgmt ${IMAGE_ROOTFS}/etc/pmon.d/logmgmt + ln -s /usr/share/starlingx/pmon.d/mtcClient.conf ${IMAGE_ROOTFS}/etc/pmon.d/mtcClient.conf + ln -s /usr/share/starlingx/pmon.d/mtcalarm.conf ${IMAGE_ROOTFS}/etc/pmon.d/mtcalarm.conf + ln -s /usr/share/starlingx/pmon.d/mtclogd.conf ${IMAGE_ROOTFS}/etc/pmon.d/mtclogd.conf + ln -s /usr/share/starlingx/pmon.d/sm-eru.conf ${IMAGE_ROOTFS}/etc/pmon.d/sm-eru.conf + ln -s /usr/share/starlingx/pmon.d/sshd.conf ${IMAGE_ROOTFS}/etc/pmon.d/sshd.conf + ln -s /usr/share/starlingx/pmon.d/sssd.conf ${IMAGE_ROOTFS}/etc/pmon.d/sssd.conf + 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/sysinv-fpga-agent.conf ${IMAGE_ROOTFS}/etc/pmon.d/sysinv-fpga-agent.conf + ln -s /usr/share/starlingx/pmon.d/syslog-ng.conf ${IMAGE_ROOTFS}/etc/pmon.d/syslog-ng.conf +fi + true %end