meta-ibm:fans:monitor: Use JSON config files installed from repo
The `witherspoon` and `p10bmc` machines' JSON config files should now
use the JSON config files installed from the repository.
Change-Id: I47669745aa7047c4de64ee8aedc98437593a3b62
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
deleted file mode 100644
index 85cc4d8..0000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
+++ /dev/null
@@ -1,36 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI:witherspoon = "file://config.json"
-SRC_URI:p10bmc = "file://rainier-2u/config.json \
- file://rainier-4u/config.json \
- file://rainier-1s4u/config.json \
- file://everest/config.json \
- "
-
-do_install:witherspoon() {
- install -d ${D}/${datadir}/phosphor-fan-presence/monitor/
- install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/
-}
-
-do_install:p10bmc() {
- # Install Rainier-2U/4U fan monitor config files
- install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/
- install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/
- install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/
- install -m 0644 ${WORKDIR}/rainier-2u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/
- install -m 0644 ${WORKDIR}/rainier-4u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/
- install -m 0644 ${WORKDIR}/rainier-1s4u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/
-
- # Install Everest fan monitor config file
- install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/
- install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/
-}
-
-FILES:${PN}:append:witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json"
-FILES:${PN}:remove:witherspoon = "${monitor_datadir}/monitor.yaml"
-
-FILES:${PN}:remove:p10bmc = "${monitor_datadir}/monitor.yaml"
-FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json"
-FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json"
-FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json"
-FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
deleted file mode 100644
index 632c76b..0000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
- "fans": [
- {
- "inventory": "/system/chassis/motherboard/fan0",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan0_0",
- "threshold": 30,
- "has_target": true
- },
- {
- "name": "fan0_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan1",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan1_0",
- "threshold": 30,
- "has_target": true
- },
- {
- "name": "fan1_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan2",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan2_0",
- "threshold": 30,
- "has_target": true
- },
- {
- "name": "fan2_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan3",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan3_0",
- "threshold": 30,
- "has_target": true
- },
- {
- "name": "fan3_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- }
- ],
- "sensor_trust_groups": [
- {
- "class": "NonzeroSpeed",
- "group": [
- {
- "name": "fan0_1"
- },
- {
- "name": "fan1_1"
- },
- {
- "name": "fan2_1"
- },
- {
- "name": "fan3_1"
- }
- ]
- }
- ],
- "fault_handling":
- {
- "num_nonfunc_rotors_before_error": 1,
-
- "power_off_config":
- [
- {
- "type": "hard",
- "cause": "missing_fan_frus",
- "count": 1,
- "delay": 25,
- "state": "at_pgood"
- },
- {
- "type": "epow",
- "cause": "nonfunc_fan_rotors",
- "count": 3,
- "service_mode_delay": 300,
- "meltdown_delay": 300
- }
- ]
- }
-}
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
deleted file mode 100644
index eb519d9..0000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "fans": [
- {
- "inventory": "/system/chassis/motherboard/fan0",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan0_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan1",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan1_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan2",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan2_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan4",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan4_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- }
- ],
- "fault_handling":
- {
- "num_nonfunc_rotors_before_error": 1,
-
- "power_off_config":
- [
- {
- "type": "hard",
- "cause": "missing_fan_frus",
- "count": 1,
- "delay": 25,
- "state": "at_pgood"
- },
- {
- "type": "epow",
- "cause": "nonfunc_fan_rotors",
- "count": 2,
- "service_mode_delay": 300,
- "meltdown_delay": 300
- }
- ]
- }
-}
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
deleted file mode 100644
index b4143ad..0000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
- "fans": [
- {
- "inventory": "/system/chassis/motherboard/fan0",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan0_0",
- "threshold": 30,
- "has_target": true,
- "factor": 0.627,
- "offset": 750
- },
- {
- "name": "fan0_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan1",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan1_0",
- "threshold": 30,
- "has_target": true,
- "factor": 0.627,
- "offset": 750
- },
- {
- "name": "fan1_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan2",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan2_0",
- "threshold": 30,
- "has_target": true,
- "factor": 0.627,
- "offset": 750
- },
- {
- "name": "fan2_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan3",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan3_0",
- "threshold": 30,
- "has_target": true,
- "factor": 0.627,
- "offset": 750
- },
- {
- "name": "fan3_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan4",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan4_0",
- "threshold": 30,
- "has_target": true,
- "factor": 0.627,
- "offset": 750
- },
- {
- "name": "fan4_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan5",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan5_0",
- "threshold": 30,
- "has_target": true,
- "factor": 0.627,
- "offset": 750
- },
- {
- "name": "fan5_1",
- "threshold": 30,
- "has_target": false
- }
- ]
- }
- ],
- "sensor_trust_groups": [
- {
- "class": "NonzeroSpeed",
- "group": [
- {
- "name": "fan0_1"
- },
- {
- "name": "fan1_1"
- },
- {
- "name": "fan2_1"
- },
- {
- "name": "fan3_1"
- },
- {
- "name": "fan4_1"
- },
- {
- "name": "fan5_1"
- }
- ]
- }
- ],
- "fault_handling":
- {
- "num_nonfunc_rotors_before_error": 1,
-
- "power_off_config":
- [
- {
- "type": "hard",
- "cause": "missing_fan_frus",
- "count": 1,
- "delay": 25,
- "state": "at_pgood"
- },
- {
- "type": "epow",
- "cause": "nonfunc_fan_rotors",
- "count": 3,
- "service_mode_delay": 300,
- "meltdown_delay": 300
- }
- ]
- }
-}
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
deleted file mode 100644
index 1bfb537..0000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "fans": [
- {
- "inventory": "/system/chassis/motherboard/fan0",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan0_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan1",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan1_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan2",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan2_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan3",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan3_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan4",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan4_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan5",
- "method": "count",
- "count_interval": 1,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 30,
- "fan_missing_error_delay": 20,
- "nonfunc_rotor_error_delay": 0,
- "sensors": [
- {
- "name": "fan5_0",
- "threshold": 30,
- "has_target": true
- }
- ]
- }
- ],
- "fault_handling":
- {
- "num_nonfunc_rotors_before_error": 1,
-
- "power_off_config":
- [
- {
- "type": "hard",
- "cause": "missing_fan_frus",
- "count": 1,
- "delay": 25,
- "state": "at_pgood"
- },
- {
- "type": "epow",
- "cause": "nonfunc_fan_rotors",
- "count": 2,
- "service_mode_delay": 300,
- "meltdown_delay": 300
- }
- ]
- }
-}
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json
deleted file mode 100644
index f0df157..0000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "fans": [
- {
- "inventory": "/system/chassis/motherboard/fan0",
- "functional_delay": 5,
- "allowed_out_of_range_time": 30,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 20,
- "sensors": [
- {
- "name": "fan0_0",
- "has_target": true
- },
- {
- "name": "fan0_1",
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan1",
- "functional_delay": 5,
- "allowed_out_of_range_time": 30,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 20,
- "sensors": [
- {
- "name": "fan1_0",
- "has_target": true
- },
- {
- "name": "fan1_1",
- "has_target": false
- }
- ],
- "condition": {
- "name": "propertiesMatch",
- "properties": [
- {
- "object": "/xyz/openbmc_project/inventory/system/chassis",
- "interface": "xyz.openbmc_project.Inventory.Decorator.CoolingType",
- "property": {
- "name": "WaterCooled",
- "type": "bool",
- "value": false
- }
- }
- ]
- }
- },
- {
- "inventory": "/system/chassis/motherboard/fan2",
- "functional_delay": 5,
- "allowed_out_of_range_time": 30,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 20,
- "sensors": [
- {
- "name": "fan2_0",
- "has_target": true
- },
- {
- "name": "fan2_1",
- "has_target": false
- }
- ]
- },
- {
- "inventory": "/system/chassis/motherboard/fan3",
- "functional_delay": 5,
- "allowed_out_of_range_time": 30,
- "deviation": 15,
- "num_sensors_nonfunc_for_fan_nonfunc": 1,
- "monitor_start_delay": 20,
- "sensors": [
- {
- "name": "fan3_0",
- "has_target": true
- },
- {
- "name": "fan3_1",
- "has_target": false
- }
- ]
- }
- ],
- "sensor_trust_groups": [
- {
- "class": "NonzeroSpeed",
- "group": [
- {
- "name": "fan0_1"
- },
- {
- "name": "fan1_1"
- },
- {
- "name": "fan2_1"
- },
- {
- "name": "fan3_1"
- },
- {
- "name": "fan0_0",
- "in_trust": false
- },
- {
- "name": "fan1_0",
- "in_trust": false
- },
- {
- "name": "fan2_0",
- "in_trust": false
- },
- {
- "name": "fan3_0",
- "in_trust": false
- }
- ]
- }
- ]
-}
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 56a1ce9..aa1925b 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -59,11 +59,9 @@
# Enable the use of JSON on the fan applications that support it
PACKAGECONFIG:append:witherspoon = " json"
EXTRA_OECONF:append:witherspoon = " --disable-json-control"
-RDEPENDS:${PN}-monitor:append:witherspoon = " phosphor-fan-monitor-config"
PACKAGECONFIG:append:p10bmc = " json sensor-monitor"
FAN_PACKAGES:append:p10bmc = " sensor-monitor"
-RDEPENDS:${PN}-monitor:append:p10bmc = " phosphor-fan-monitor-config"
# Install fan control JSON config files
SRC_URI:append:p10bmc = " \