meta-ibm: override host settings using template
Commit 7298b24 introduced the concept of a phosphor-settings file that
supported multiple hosts. Adapt the meta-ibm override of host settings
to utilize this new concept.
Tested:
- Verified expected PowerCap settings were in generated
settings_manager.hpp file
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iacccb71c09970d55cfc44deecb40e15782e98c1a
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend
new file mode 100644
index 0000000..fbf6e48
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+# Multi Host Overrides
+SRC_URI += "file://ibm_host_settings.override.yml"
+SETTINGS_HOST_TEMPLATES:append = " ibm_host_settings.override.yml"
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-defaults-native/ibm_host_settings.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-defaults-native/ibm_host_settings.override.yml
new file mode 100644
index 0000000..84e1ddc
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-defaults-native/ibm_host_settings.override.yml
@@ -0,0 +1,7 @@
+/xyz/openbmc_project/control/host{}/power_cap:
+ - Interface: xyz.openbmc_project.Control.Power.Cap
+ Properties:
+ PowerCap:
+ Default: 0
+ PowerCapEnable:
+ Default: 'false'
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml
index 123d985..8dae59e 100644
--- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml
@@ -15,11 +15,3 @@
Properties:
Enabled:
Default: 'true'
-
-/xyz/openbmc_project/control/host0/power_cap:
- - Interface: xyz.openbmc_project.Control.Power.Cap
- Properties:
- PowerCap:
- Default: 0
- PowerCapEnable:
- Default: 'false'