From 8daae52d79343a258a0f15536089227bc3161587 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Fri, 19 Jun 2020 13:48:27 -0500 Subject: fans:monitor:witherspoon: Install config.json file In prep for switching the witherspoon machine over to using a runtime fan monitoring JSON configuration, install the configuration file into the image now. Tested: Verified both `monitor.yaml` and `config.json` in phosphor-fan Built/installed witherspoon image and config.json file present Verified YAML config still used instead of present JSON config (From meta-ibm rev: 36206800a699a1429d30ad32a36e4f960ac6c7b4) Change-Id: I75d72a2731f201d37d38c9d436eff2af522bc6da Signed-off-by: Matthew Barth Signed-off-by: Andrew Geissler --- .../witherspoon/config.json | 121 +++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json (limited to 'meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon') 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 new file mode 100644 index 000000000..5923ccc42 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json @@ -0,0 +1,121 @@ +{ + "fans": [ + { + "inventory": "/system/chassis/motherboard/fan0", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "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, + "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, + "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, + "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 + } + ] + } + ] +} -- cgit v1.2.3