diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-04-22 21:06:02 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-27 19:52:12 +0300 |
| commit | e161514219e0dc8a957dabbb8529fb9fcac4e115 (patch) | |
| tree | 5de46006517d690f5793eec41281d60611228ecd /meta-ibm/recipes-phosphor/inventory/inventory-cleanup | |
| parent | a3f54c8b8cbd50bc86efdc52cfb7d348d8c19d21 (diff) | |
| download | openbmc-e161514219e0dc8a957dabbb8529fb9fcac4e115.tar.xz | |
meta-ibm: move all meta-witherspoon metadata
The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon. Move everything to meta-ibm.
The meta-ibm README is re-written to more accurately reflect the scope
of the layer.
Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.
(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)
Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor/inventory/inventory-cleanup')
| -rw-r--r-- | meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml | 16 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml | 51 |
2 files changed, 67 insertions, 0 deletions
diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml new file mode 100644 index 0000000000..a2ff9d177a --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml @@ -0,0 +1,16 @@ +description: > + Swift inventory fixups + +events: + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml new file mode 100644 index 0000000000..a363bda8d7 --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml @@ -0,0 +1,51 @@ +description: > + Witherspoon inventory fixups + +events: + - name: Remove power_supplies + description: > + Remove the deprecated 'power_supply' objects + type: startup + actions: + - name: destroyObjects + paths: + - /system/chassis/power_supply0 + - /system/chassis/power_supply1 + - /system/chassis/powersupply0 + - /system/chassis/powersupply1 + + - name: Remove fan1 + description: > + 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: + - /system/chassis/motherboard/fan1/fan1_0 + - /system/chassis/motherboard/fan1/fan1_1 + - /system/chassis/motherboard/fan1 + + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string |