From 84244c469e685d645688995769075cd725b5fc46 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 4 Jun 2019 14:10:32 -0500 Subject: swift-ipmi: Add in bmc fru config Refactor the config yaml to be machine specific The only rule is the values in this file not conflict with the FRU_ID fields in the Swift MRW. Swift MRU has FRU_ID values that go into the 50s so just add 10 to all values in this file. (From meta-ibm rev: 89af26a2ca92f79493a652ae279a6c48a67d1f7f) Change-Id: I4a2e3ca95791d0ec2201b027894833a7ef7b4cfb Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../acx22-yaml-config/acx22-ipmi-fru-bmc.yaml | 120 --------------------- .../swift/acx22-ipmi-fru-bmc.yaml | 120 +++++++++++++++++++++ .../witherspoon/acx22-ipmi-fru-bmc.yaml | 120 +++++++++++++++++++++ 3 files changed, 240 insertions(+), 120 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-fru-bmc.yaml create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-fru-bmc.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-fru-bmc.yaml deleted file mode 100644 index a5ce2e841..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-fru-bmc.yaml +++ /dev/null @@ -1,120 +0,0 @@ -50: - /system/chassis/motherboard/fan0: - entityID: 29 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Product Name - IPMIFruSection: Product -51: - /system/chassis/motherboard/fan1: - entityID: 29 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Product Name - IPMIFruSection: Product -52: - /system/chassis/motherboard/fan2: - entityID: 29 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Product Name - IPMIFruSection: Product -53: - /system/chassis/motherboard/fan3: - entityID: 29 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Product Name - IPMIFruSection: Product -60: - /system/chassis/motherboard/boxelder/bmc: - entityID: 6 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board -70: - /system/chassis/motherboard/boxelder/bmc/ethernet: - entityID: 1 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Product Name - IPMIFruSection: Product -75: - /system/chassis/motherboard/powersupply0: - entityID: 10 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board -76: - /system/chassis/motherboard/powersupply1: - entityID: 10 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml new file mode 100644 index 000000000..6de8be206 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml @@ -0,0 +1,120 @@ +60: + /system/chassis/motherboard/fan0: + entityID: 29 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +61: + /system/chassis/motherboard/fan1: + entityID: 29 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +62: + /system/chassis/motherboard/fan2: + entityID: 29 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +63: + /system/chassis/motherboard/fan3: + entityID: 29 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +70: + /system/chassis/motherboard/management_card/bmc: + entityID: 6 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Asset: + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board +80: + /system/chassis/motherboard/management_card/bmc/ethernet: + entityID: 1 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +85: + /system/chassis/motherboard/powersupply0: + entityID: 10 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Asset: + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board +86: + /system/chassis/motherboard/powersupply1: + entityID: 10 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Asset: + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml new file mode 100644 index 000000000..a5ce2e841 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml @@ -0,0 +1,120 @@ +50: + /system/chassis/motherboard/fan0: + entityID: 29 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +51: + /system/chassis/motherboard/fan1: + entityID: 29 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +52: + /system/chassis/motherboard/fan2: + entityID: 29 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +53: + /system/chassis/motherboard/fan3: + entityID: 29 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +60: + /system/chassis/motherboard/boxelder/bmc: + entityID: 6 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +70: + /system/chassis/motherboard/boxelder/bmc/ethernet: + entityID: 1 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +75: + /system/chassis/motherboard/powersupply0: + entityID: 10 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +76: + /system/chassis/motherboard/powersupply1: + entityID: 10 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board -- cgit v1.2.3