summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common
diff options
context:
space:
mode:
authorAndrew Geissler <andrewg@us.ibm.com>2017-02-06 15:44:25 -0600
committerPatrick Williams <patrick@stwcx.xyz>2017-02-15 21:43:27 +0000
commit977b7a12a09937f692e3218ef5b15cb32716f911 (patch)
treee0a8e81d2310fd99264f7a10c90d993e69ef3f54 /meta-phosphor/common
parente704d6c6619f8faae5383cb177ea986aa1f3d846 (diff)
downloadtalos-openbmc-977b7a12a09937f692e3218ef5b15cb32716f911.tar.gz
talos-openbmc-977b7a12a09937f692e3218ef5b15cb32716f911.zip
Add OnFailure= options to boot targets
When services associated with a target fail, the target should go to the quiesce state for error gathering and policy checks on automated recovery. Use the OnFailureJobMode=flush to ensure all queued services are cancelled when entering quiesce. Change-Id: I4023a9c842500bb57013196aefbded533131ef00 Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common')
-rw-r--r--meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target2
-rw-r--r--meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target2
-rw-r--r--meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target2
-rw-r--r--meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target4
4 files changed, 9 insertions, 1 deletions
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target
index c8eda8ab8..c54fea6ff 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target
@@ -6,3 +6,5 @@ Wants=mapper-wait@-org-openbmc-control-chassis%i.service
After=mapper-wait@-org-openbmc-control-chassis%i.service
Conflicts=obmc-chassis-stop@%i.target
RefuseManualStop=yes
+OnFailure=obmc-quiesce-host@%i.target
+OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
index aeac3d66d..0fccea219 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
@@ -6,3 +6,5 @@ Wants=mapper-wait@-org-openbmc-control-chassis%i.service
After=mapper-wait@-org-openbmc-control-chassis%i.service
Conflicts=obmc-chassis-start@%i.target
RefuseManualStop=yes
+OnFailure=obmc-power-chassis-off@%i.target
+OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target
index f9571b15e..32250a419 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target
@@ -6,3 +6,5 @@ Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
Conflicts=obmc-power-chassis-off@%i.target
RefuseManualStop=yes
+OnFailure=obmc-power-chassis-off@%i.target
+OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
index 8a5eba8ca..4347fa426 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
@@ -1,4 +1,6 @@
[Unit]
Description=Power%i Host Off
Wants={SYSTEMD_DEFAULT_TARGET}
-RefuseManualStop=yes \ No newline at end of file
+RefuseManualStop=yes
+OnFailure=obmc-chassis-stop@%i.target
+OnFailureJobMode=flush
OpenPOWER on IntegriCloud