diff options
author | Matthew Barth <msbarth@us.ibm.com> | 2020-06-19 21:48:27 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-30 00:31:23 +0300 |
commit | 8daae52d79343a258a0f15536089227bc3161587 (patch) | |
tree | 2759e6a8f36aca2a84196220a711ed3f77062b32 /meta-ibm/recipes-phosphor | |
parent | 1c89b1d18f84fb4a1e13d1b9b55328a83a1d34a2 (diff) | |
download | openbmc-8daae52d79343a258a0f15536089227bc3161587.tar.xz |
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 <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor')
3 files changed, 135 insertions, 0 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index 8f2097cc1..9307f17a3 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1 +1,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI_witherspoon += "file://monitor.yaml" +SRC_URI_witherspoon += "file://config.json" + +do_install_append_witherspoon() { + DEST=${D}${monitor_datadir} + install -D monitor.yaml ${D}${monitor_datadir}/monitor.yaml + install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ + install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ +} + +FILES_${PN}_witherspoon += "${datadir}/phosphor-fan-presence/monitor/config.json" +FILES_${PN}_witherspoon += "${monitor_datadir}/monitor.yaml" 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 + } + ] + } + ] +} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 10f3f2284..cb89a3a08 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -58,6 +58,7 @@ SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON # Enable the use of JSON on the fan applications that support it EXTRA_OECONF_append_witherspoon = " --enable-json" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" +RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" # Set the appropriate i2c address used within the overridden phosphor-fan-control@.service # file that's used for witherspoon type(including witherspoon-tacoma) machines |