starlingx/meta-starlingx
Code Issues Proposed changes

sysinv-agent: rm legacy PIDFOLE and enable unit file

Browse Source 
- Enables sysinv-agent.service by default
- Set PIDFILE to /run/sysinv-agent.pid

Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Babak Sarashki 2020-07-01 21:05:08 -07:00
parent e8199c40db
commit 8df3b25350
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta-stx-flock/stx-config/files/0003-sysinv-agent-remove-legacy-pid-directory.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/sysinv/sysinv-agent/sysinv-agent.conf b/sysinv/sysinv-agent/sysinv-agent.conf
index 46afac67b..aad37576c 100644
--- a/sysinv/sysinv-agent/sysinv-agent.conf
+++ b/sysinv/sysinv-agent/sysinv-agent.conf
@@ -1,6 +1,6 @@
[process]
process = sysinv-agent
-pidfile = /var/run/sysinv-agent.pid
+pidfile = /run/sysinv-agent.pid
script = /etc/init.d/sysinv-agent
style = lsb ; ocf or lsb
severity = major ; minor, major, critical
diff --git a/sysinv/sysinv-agent/sysinv-agent.service b/sysinv/sysinv-agent/sysinv-agent.service
index cb8663f68..37c2c221e 100644
--- a/sysinv/sysinv-agent/sysinv-agent.service
+++ b/sysinv/sysinv-agent/sysinv-agent.service
@@ -9,7 +9,7 @@ Type=forking
RemainAfterExit=yes
ExecStart=/etc/init.d/sysinv-agent start
ExecStop=/etc/init.d/sysinv-agent stop
-PIDFile=/var/run/sysinv-agent.pid
+PIDFile=/run/sysinv-agent.pid
[Install]
WantedBy=multi-user.target

4
meta-stx-flock/stx-config/sysinv-agent.bb
View File

@ -6,12 +6,14 @@ S = "${S_DIR}/sysinv/sysinv-agent"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI += "file://0003-sysinv-agent-remove-legacy-pid-directory.patch;striplevel=3"
RDEPENDS_sysinv-agent += " python"
inherit systemd
SYSTEMD_PACKAGES += "sysinv-agent"
SYSTEMD_SERVICE_sysinv-agent = "sysinv-agent.service"
SYSTEMD_AUTO_ENABLE_sysinv-agent = "disable"
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
do_configure[noexec] = "1"
do_compile[noexec] = "1"