starlingx/metal
Code Issues Proposed changes

Merge "Add ipsec auth server pmon configuration"

Browse Source
This commit is contained in:
Zuul 2024-02-20 17:35:21 +00:00 committed by Gerrit Code Review
commit 880df77a25
5 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kickstart/files/kickstart.cfg
View File

@ -3288,6 +3288,7 @@ if [ "${controller}" = true ] ; then
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-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/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 ln -s /usr/share/starlingx/pmon.d/luks.conf ${IMAGE_ROOTFS}/etc/pmon.d/luks.conf
ln -s /usr/share/starlingx/pmon.d/ipsec-server.conf ${IMAGE_ROOTFS}/etc/pmon.d/ipsec-server.conf
fi fi
if [ "${worker}" = true ] ; then if [ "${worker}" = true ] ; then
ilog "Setting up pmon files for ${TRAIT__WORKER} and/or ${TRAIT__WORKER} side of ${SYSTEM_TYPE__AIO}" ilog "Setting up pmon files for ${TRAIT__WORKER} and/or ${TRAIT__WORKER} side of ${SYSTEM_TYPE__AIO}"

1
kickstart/files/miniboot.cfg
View File

@ -3129,6 +3129,7 @@ if [ "${controller}" = true ] ; then
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-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/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 ln -s /usr/share/starlingx/pmon.d/luks.conf ${IMAGE_ROOTFS}/etc/pmon.d/luks.conf
ln -s /usr/share/starlingx/pmon.d/ipsec-server.conf ${IMAGE_ROOTFS}/etc/pmon.d/ipsec-server.conf
fi fi
if [ "${worker}" = true ] ; then if [ "${worker}" = true ] ; then
ilog "Setting up pmon files for ${TRAIT__WORKER} and/or ${TRAIT__WORKER} side of ${SYSTEM_TYPE__AIO}" ilog "Setting up pmon files for ${TRAIT__WORKER} and/or ${TRAIT__WORKER} side of ${SYSTEM_TYPE__AIO}"

1
mtce-control/debian/deb_folder/mtce-control.install
View File

@ -2,3 +2,4 @@ lib/systemd/system/hbsAgent.service
etc/init.d/goenabledControl etc/init.d/goenabledControl
etc/init.d/hbsAgent etc/init.d/hbsAgent
usr/share/starlingx/pmon.d/hbsAgent.conf usr/share/starlingx/pmon.d/hbsAgent.conf
usr/share/starlingx/pmon.d/ipsec-server.conf

2
mtce-control/src/Makefile
View File

@ -3,6 +3,7 @@ SOURCE2 = goenabled
SOURCE3 = hbsAgent SOURCE3 = hbsAgent
SOURCE4 = hbsAgent.conf SOURCE4 = hbsAgent.conf
SOURCE5 = hbsAgent.service SOURCE5 = hbsAgent.service
SOURCE6 = ipsec-server.conf
PMONDIR ?= $(_sysconfdir)/pmon.d PMONDIR ?= $(_sysconfdir)/pmon.d
local_etc_goenabledd = $(_sysconfdir)/goenabled.d local_etc_goenabledd = $(_sysconfdir)/goenabled.d
@ -23,6 +24,7 @@ install:
# Controller-Only Process Monitor Config files # Controller-Only Process Monitor Config files
install -m 755 -d $(buildroot)/$(PMONDIR) install -m 755 -d $(buildroot)/$(PMONDIR)
install -m 644 -p -D scripts/$(SOURCE4) $(buildroot)/$(PMONDIR)/hbsAgent.conf install -m 644 -p -D scripts/$(SOURCE4) $(buildroot)/$(PMONDIR)/hbsAgent.conf
install -m 644 -p -D scripts/$(SOURCE6) $(buildroot)/$(PMONDIR)/ipsec-server.conf
# Controller-Only Heartbeat Service file # Controller-Only Heartbeat Service file
install -m 644 -p -D scripts/$(SOURCE5) $(buildroot)/$(_unitdir)/hbsAgent.service install -m 644 -p -D scripts/$(SOURCE5) $(buildroot)/$(_unitdir)/hbsAgent.service

17
mtce-control/src/scripts/ipsec-server.conf Normal file
View File

@ -0,0 +1,17 @@
[process]
process = ipsec-server
service = ipsec-server
pidfile = /var/run/ipsec-server.pid
style = lsb ; ocf or lsb
severity = major ; minor, major, critical
restarts = 3 ; restart retries before error assertion
interval = 5 ; number of seconds to wait between restarts
debounce = 20 ; number of seconds that a process needs to remain
; running before degrade is removed and retry count
; is cleared.
startuptime = 5 ; Seconds to wait after process start before starting the debounce monitor
mode = passive ; Monitoring mode: passive (default) or active
; passive: process death monitoring (default: always)
; active : heartbeat monitoring, i.e. request / response messaging
; ignore : do not monitor or stop monitoring