starlingx
/
ha
Code Issues Proposed changes

Duplicate pmon.d conf files to another location 

Created a duplicate install of /etc/pmon.d/*.conf files
to /usr/share/starlingx/pmon.d/

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

Test Plan:
PASS: duplicate conf on deb

Story: 2010211
Task: 46114

Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com>
Change-Id: Ia3774ac59b1df40aa1726bb182390b4b58812141
This commit is contained in:
Leonardo Fagundes Luz Serrano 2022-08-23 23:24:21 -03:00
parent bd9e560d4b
commit 199c1a8ba8
6 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
service-mgmt-api/debian/deb_folder/rules
View File

@ -3,6 +3,7 @@
export PYBUILD_NAME=sm-api export PYBUILD_NAME=sm-api
ROOT := debian/tmp ROOT := debian/tmp
PMONDIR := usr/share/starlingx/pmon.d
%: %:
dh $@ --with python3 --buildsystem=pybuild dh $@ --with python3 --buildsystem=pybuild
@ -22,11 +23,13 @@ override_dh_install:
install -d $(ROOT)/etc/sm install -d $(ROOT)/etc/sm
install -d $(ROOT)/etc/init.d install -d $(ROOT)/etc/init.d
install -d $(ROOT)/etc/pmon.d install -d $(ROOT)/etc/pmon.d
install -d $(ROOT)/$(PMONDIR)
install -d $(ROOT)/lib/systemd/system/ install -d $(ROOT)/lib/systemd/system/
install -m 644 -p -D scripts/sm_api.ini $(ROOT)/etc/sm
install -m 755 -p -D scripts/sm-api $(ROOT)/etc/init.d install -m 755 -p -D scripts/sm-api $(ROOT)/etc/init.d
install -m 644 -p -D scripts/sm-api.service $(ROOT)/lib/systemd/system/ install -m 644 -p -D scripts/sm_api.ini $(ROOT)/etc/sm
install -m 644 -p -D scripts/sm-api.conf $(ROOT)/$(PMONDIR)
install -m 644 -p -D scripts/sm-api.conf $(ROOT)/etc/pmon.d install -m 644 -p -D scripts/sm-api.conf $(ROOT)/etc/pmon.d
install -m 644 -p -D scripts/sm-api.service $(ROOT)/lib/systemd/system/
dh_install dh_install

8
service-mgmt-api/debian/deb_folder/sm-api.install
View File

@ -1,9 +1,9 @@
etc/sm-api/policy.json debian/systemd/00-sm-api.preset etc/systemd/system-preset
usr/bin/sm-api
etc/init.d/sm-api etc/init.d/sm-api
etc/pmon.d/sm-api.conf etc/pmon.d/sm-api.conf
etc/sm/sm_api.ini etc/sm/sm_api.ini
etc/sm-api/policy.json
lib/systemd/system/* lib/systemd/system/*
usr/bin/sm-api
usr/lib/python3* usr/lib/python3*
debian/systemd/00-sm-api.preset etc/systemd/system-preset usr/share/starlingx/pmon.d/sm-api.conf

5
service-mgmt/sm-common/debian/deb_folder/rules
View File

@ -1,10 +1,12 @@
#!/usr/bin/make -f #!/usr/bin/make -f
export ROOT = $(CURDIR)/debian/tmp export ROOT = $(CURDIR)/debian/tmp
export PMONDIR = usr/share/starlingx/pmon.d
export VER = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') export VER = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
export VER_MJR = $(shell echo $(VER) | cut -d. -f1) export VER_MJR = $(shell echo $(VER) | cut -d. -f1)
%: %:
dh $@ dh $@
@ -20,6 +22,9 @@ override_dh_auto_install:
VER_MJR=${VER_MJR} \ VER_MJR=${VER_MJR} \
install install
install -m 750 -d $(ROOT)/$(PMONDIR)
install -m 640 -p -D scripts/sm-eru.conf $(ROOT)/$(PMONDIR)
# Prevents dh_fixperms from changing the permissions defined in the makefiles # Prevents dh_fixperms from changing the permissions defined in the makefiles
override_dh_fixperms: override_dh_fixperms:
dh_fixperms \ dh_fixperms \

5
service-mgmt/sm-common/debian/deb_folder/sm-eru.install
View File

@ -1,6 +1,7 @@
debian/systemd/00-sm-eru.preset etc/systemd/system-preset
etc/init.d/sm-eru etc/init.d/sm-eru
etc/pmon.d/sm-eru.conf etc/pmon.d/sm-eru.conf
lib/systemd/system/sm-eru.service
usr/bin/sm-eru usr/bin/sm-eru
usr/bin/sm-eru-dump usr/bin/sm-eru-dump
lib/systemd/system/sm-eru.service usr/share/starlingx/pmon.d/sm-eru.conf
debian/systemd/00-sm-eru.preset etc/systemd/system-preset

5
service-mgmt/sm/debian/deb_folder/rules
View File

@ -1,6 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
ROOT := $(CURDIR)/debian/tmp ROOT := $(CURDIR)/debian/tmp
PMONDIR := usr/share/starlingx/pmon.d
%: %:
dh $@ dh $@
@ -13,6 +14,10 @@ override_dh_auto_install:
$(MAKE) DEST_DIR=${ROOT} \ $(MAKE) DEST_DIR=${ROOT} \
UNIT_DIR=/lib/systemd/system \ UNIT_DIR=/lib/systemd/system \
install install
install -d ${ROOT}/$(PMONDIR)
install -m 644 scripts/sm.conf ${ROOT}/$(PMONDIR)
dh_install dh_install
override_dh_installsystemd: override_dh_installsystemd:

15
service-mgmt/sm/debian/deb_folder/sm.install
View File

@ -1,10 +1,11 @@
lib/systemd/system/* debian/systemd/00-sm.preset etc/systemd/system-preset
usr/bin/sm
usr/local/sbin/sm-notify
usr/local/sbin/sm-troubleshoot
usr/local/sbin/sm-notification
etc/init.d/sm etc/init.d/sm
etc/init.d/sm-shutdown etc/init.d/sm-shutdown
etc/pmon.d/sm.conf
etc/logrotate.d/sm.logrotate etc/logrotate.d/sm.logrotate
debian/systemd/00-sm.preset etc/systemd/system-preset etc/pmon.d/sm.conf
lib/systemd/system/*
usr/bin/sm
usr/local/sbin/sm-notification
usr/local/sbin/sm-notify
usr/local/sbin/sm-troubleshoot
usr/share/starlingx/pmon.d/sm.conf