starlingx
/
fault
Code Issues Proposed changes

Remove conf files from etc-pmon.d 

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.

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: 46303

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

Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com>
Change-Id: I6675cb2f567fe5b9b62842d0428e672633078281
This commit is contained in:
Leonardo Fagundes Luz Serrano 2022-09-15 14:26:52 -03:00
parent 80d6819635
commit 1ce2f045ae
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fm-rest-api/debian/deb_folder/fm-rest-api.install
View File

@ -2,5 +2,4 @@ debian/systemd/00-fm-rest-api.preset etc/systemd/system-preset
etc/fm/fm.conf
etc/fm/policy.yaml
etc/init.d
etc/pmon.d/fm-api.conf
usr/share/starlingx/pmon.d/fm-api.conf

9
fm-rest-api/debian/deb_folder/rules
View File

@ -4,8 +4,7 @@
export PYBUILD_NAME=fm-rest-api
export ROOT=debian/tmp
export FMCONFDIR=$(ROOT)/etc/fm
export PMONDIR_1=$(ROOT)/etc/pmon.d
export PMONDIR_2=$(ROOT)/usr/share/starlingx/pmon.d
export PMONDIR=$(ROOT)/usr/share/starlingx/pmon.d
export INITDIR=$(ROOT)/etc/init.d
%:
@ -14,10 +13,8 @@ export INITDIR=$(ROOT)/etc/init.d
override_dh_auto_install:
install -d -m 755 $(INITDIR)
install -p -D -m 755 scripts/fm-api $(INITDIR)/fm-api
install -d -m 755 $(PMONDIR_1)
install -p -D -m 644 fm-api-pmond.conf $(PMONDIR_1)/fm-api.conf
install -d -m 755 $(PMONDIR_2)
install -p -D -m 644 fm-api-pmond.conf $(PMONDIR_2)/fm-api.conf
install -d -m 755 $(PMONDIR)
install -p -D -m 644 fm-api-pmond.conf $(PMONDIR)/fm-api.conf
oslo-config-generator --config-file fm/config-generator.conf --output-file fm.conf.sample
install -d -m 755 $(FMCONFDIR)
install -p -D -m 600 fm.conf.sample $(FMCONFDIR)/fm.conf