diff options
author | Ratan Gupta <ratagupt@in.ibm.com> | 2017-05-29 16:23:31 +0530 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-06-07 14:48:43 +0000 |
commit | 792034b7c18bc74cc6fe9c1296a4e1bf2d6bff42 (patch) | |
tree | 6cf95f303e5048ccc24e209cd9474da67ffb7bfb /meta-openbmc-machines | |
parent | 31f77bc6c927aa721df31f96bc46a48ac97525fd (diff) | |
download | talos-openbmc-792034b7c18bc74cc6fe9c1296a4e1bf2d6bff42.tar.gz talos-openbmc-792034b7c18bc74cc6fe9c1296a4e1bf2d6bff42.zip |
Fix the mapping of IPMI chassis info area part number
This fix maps the chassis info area partnumber to the model
property of dbus object.
Resolves openbmc/openbmc#1729
Change-Id: I3974065bb8e3cfc5d5ac9a827546ec8095f717e0
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
6 files changed, 6 insertions, 24 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml index 2c7f8ee7e..717818466 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml @@ -28,15 +28,12 @@ PROC: SYS: Interfaces: xyz.openbmc_project.Inventory.Decorator.Asset: - PartNumber: + Model: IPMIFruSection: Chassis IPMIFruProperty: "Part Number" SerialNumber: IPMIFruSection: Chassis IPMIFruProperty: "Serial Number" - Model: - IPMIFruSection: Chassis - IPMIFruProperty: "Type" NODE: Interfaces: diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml index ea2ca445d..68d209650 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml @@ -71,11 +71,8 @@ SerialNumber: IPMIFruProperty: Serial Number IPMIFruSection: Chassis - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis Model: - IPMIFruProperty: Type + IPMIFruProperty: Part Number IPMIFruSection: Chassis 4: /system/chassis/motherboard/membuf0: diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml index ea2ca445d..68d209650 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml @@ -71,11 +71,8 @@ SerialNumber: IPMIFruProperty: Serial Number IPMIFruSection: Chassis - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis Model: - IPMIFruProperty: Type + IPMIFruProperty: Part Number IPMIFruSection: Chassis 4: /system/chassis/motherboard/membuf0: diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml index c2b0f5c3e..d141babd7 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml @@ -28,11 +28,8 @@ SerialNumber: IPMIFruProperty: Serial Number IPMIFruSection: Chassis - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis Model: - IPMIFruProperty: Type + IPMIFruProperty: Part Number IPMIFruSection: Chassis /system/chassis/motherboard/membuf: diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml index 3af5e6f55..c459072b6 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml @@ -71,11 +71,8 @@ SerialNumber: IPMIFruProperty: Serial Number IPMIFruSection: Chassis - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis Model: - IPMIFruProperty: Type + IPMIFruProperty: Part Number IPMIFruSection: Chassis 12: /system/chassis/motherboard/dimm0: diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml index cc8abc1a0..d33757751 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml @@ -71,11 +71,8 @@ SerialNumber: IPMIFruProperty: Serial Number IPMIFruSection: Chassis - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis Model: - IPMIFruProperty: Type + IPMIFruProperty: Part Number IPMIFruSection: Chassis 4: /system/chassis/motherboard/membuf0: |