From 0cab252232a2b1f70263a50e250a63b7edde5ffa Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Fri, 5 Oct 2018 16:17:25 -0500 Subject: wspoon: Remove fan1 on water cooled only Fan1 is not required on water cooled Witherspoons, therefore it should be removed from inventory and let the corresponding fan applications recreate their associated inventory interfaces/properties for the fan1 object. Previously, fan1 was removed by inventory manager whenever it was restarted regardless of whether the Witherspoon was water or air cooled. This change updates inventory manager to be capable of reading a property that it hosts and using it as a filter on performing an action. In the case of water cooled Witherspoons, the `WaterCooled` property hosted by inventory manager is read as a filter to have inventory manager destroy all the fan1 objects. This will only remove the fan1 inventory objects on water cooled Witherspoons now. Requires: pim: 979eb591652fba30f86ec5b7f5c5f73c06651c70 (From meta-ibm rev: 7f347377c2ce38e03154e712f8490839b5d344ef) Change-Id: I26d6c645bb80e8fee20c3d254d9d4089665e37a6 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../inventory/inventory-cleanup/inventory-cleanup.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml index 01632e6d8..cce8c9dcc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml @@ -19,6 +19,17 @@ events: Remove all fan1 associated objects and have fan presence and fan monitor create it based on cooling type. type: startup + filters: + - name: propertyIs + service: xyz.openbmc_project.Inventory.Manager + path: /system/chassis + interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + property: WaterCooled + value: + value: true + type: boolean + dbusMember: "sdbusplus::xyz::openbmc_project::Inventory::\ + Decorator::server::CoolingType" actions: - name: destroyObjects paths: -- cgit v1.2.3