starlingx/nfv
Code Issues Proposed changes

Debian: Remove conf files from etc-pmon.d

Browse Source 
Removed conf files from /etc/pmon.d/
as they are being moved to another location.

This is part of an effort to allow pmon conf files
to be selected at runtime by kickstarts.

The change is debian-only, since centos support
will be dropped soon.
Centos' pmon conf files remain in /etc/pmon.d/

Test Plan:
PASS - deb doesn't install anything to /etc/pmon.d/
PASS - AIOSX unlocked-enabled-available
PASS - Standard 2+2 unlocked-enabled-available

Story: 2010211
Task: 46307

Depends-On: https://review.opendev.org/c/starlingx/metal/+/855095

Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com>
Change-Id: Ica5dfca4778c60664e37fd3eb8768b8a159565e1
This commit is contained in:
Leonardo Fagundes Luz Serrano 2022-09-15 14:44:12 -03:00
parent 2e008011ae
commit 312f68fae9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mtce-guest/debian/deb_folder/mtce-guest-server.install
View File

@ -2,6 +2,5 @@ etc/init.d/guestServer
etc/logrotate.d/guestServer.logrotate
etc/mtc/guestServer.ini
etc/mtc/tmp
etc/pmon.d/guestServer.conf
usr/local/bin/guestServer
usr/share/starlingx/pmon.d/guestServer.conf

9
mtce-guest/debian/deb_folder/rules
View File

@ -7,8 +7,7 @@ export BINDIR=/usr/local/bin
export INITDIR=$(ROOT)/etc/init.d
export LOGDIR=$(ROOT)/etc/logrotate.d
export MTCDIR=$(ROOT)/etc/mtc
export PMONDIR_1=${ROOT}/usr/share/starlingx/pmon.d
export PMONDIR_2=$(ROOT)/etc/pmon.d
export PMONDIR=${ROOT}/usr/share/starlingx/pmon.d
export SYSCONFDIR=/etc
export UNITDIR=/lib/systemd/system
@ -32,10 +31,8 @@ override_dh_auto_install:
install -d -m 755 $(MTCDIR)/tmp
install -p -D -m 644 scripts/guest.ini $(MTCDIR)/guestAgent.ini
install -p -D -m 644 scripts/guest.ini $(MTCDIR)/guestServer.ini
install -d -m 755 $(PMONDIR_1)
install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR_1)/guestServer.conf
install -d -m 755 $(PMONDIR_2)
install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR_2)/guestServer.conf
install -d -m 755 $(PMONDIR)
install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR)/guestServer.conf
override_dh_installsystemd:
dh_installsystemd --name guestServer