fans:monitor:witherspoon: Enable JSON config
Use the installed `config.json` as the fan monitoring configuration to
load at runtime. This replaces the need of the build time YAML
`monitor.yaml` configuration.
Tested:
`monitor.yaml` removed from build image staging location
Built/powered on image using the `config.json` file
(From meta-ibm rev: 27be42e03193352d7c7ee51784448cb06d1b8e2c)
Change-Id: I80c268b26dddd820e7c9c640eab2d39452ab3a29
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.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
index 9307f17..cb29a74 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
@@ -1,14 +1,11 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-SRC_URI_witherspoon += "file://monitor.yaml"
-SRC_URI_witherspoon += "file://config.json"
+SRC_URI_witherspoon = "file://config.json"
-do_install_append_witherspoon() {
- DEST=${D}${monitor_datadir}
- install -D monitor.yaml ${D}${monitor_datadir}/monitor.yaml
+do_install_witherspoon() {
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"
+FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json"
+FILES_${PN}_remove_witherspoon = "${monitor_datadir}/monitor.yaml"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml
deleted file mode 100644
index 5db7966..0000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml
+++ /dev/null
@@ -1,73 +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
- 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
- # Create fan1 inventory & sensors on air cooled only
- 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:
- # Include all _1 fans to determine trust
- - name: fan0_1
- - name: fan1_1
- - name: fan2_1
- - name: fan3_1
- # Add all _0 fans to be included in trust result effects,
- # but not in determining trust
- - name: fan0_0
- in_trust: false
- - name: fan1_0
- in_trust: false
- - name: fan2_0
- in_trust: false
- - name: fan3_0
- in_trust: false