From d92b5ed20b9213691e7e18c7c7c37dfb9d705337 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 17:22:20 +0000 Subject: ibm: settings: Replace rainier with p10bmc The IBM rainier machine name is being replaced with the generic p10bmc. Change-Id: I3947988f73e601ca281b6222a6116bc7f50c8c32 Signed-off-by: Adriana Kobylak --- ...HypervisorInterface-default-p10bmc.override.yml | 74 ++++++++++++++++++++++ ...ypervisorInterface-default-rainier.override.yml | 74 ---------------------- .../settings/phosphor-settings-manager_%.bbappend | 2 +- 3 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-p10bmc.override.yml delete mode 100644 meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-rainier.override.yml (limited to 'meta-ibm/recipes-phosphor/settings') diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-p10bmc.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-p10bmc.override.yml new file mode 100644 index 0000000000..ecc95317f7 --- /dev/null +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-p10bmc.override.yml @@ -0,0 +1,74 @@ +/xyz/openbmc_project/network/hypervisor: + - Interface: xyz.openbmc_project.Network.SystemConfiguration + Properties: + HostName: + Default: '""' + DefaultGateway: + Default: '"0.0.0.0"' + +/xyz/openbmc_project/network/hypervisor/eth0: + - Interface: xyz.openbmc_project.Network.MACAddress + Properties: + MACAddress: + Default: '"00:00:00:00:00:00"' + Validation: + Type: "regex" + Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' + - Interface: xyz.openbmc_project.Network.EthernetInterface + Properties: + DHCPEnabled: + Default: EthernetInterface::DHCPConf::none + +/xyz/openbmc_project/network/hypervisor/eth0/ipv4/addr0: + - Interface: xyz.openbmc_project.Network.IP + Properties: + Address: + Default: '"0.0.0.0"' + PrefixLength: + Default: 0 + Validation: + Type: "range" + Validator: 0..32 + Unit: "bits" + Origin: + Default: IP::AddressOrigin::Static + Type: + Default: IP::Protocol::IPv4 + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'false' + +/xyz/openbmc_project/network/hypervisor/eth1: + - Interface: xyz.openbmc_project.Network.MACAddress + Properties: + MACAddress: + Default: '"00:00:00:00:00:00"' + Validation: + Type: "regex" + Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' + - Interface: xyz.openbmc_project.Network.EthernetInterface + Properties: + DHCPEnabled: + Default: EthernetInterface::DHCPConf::none + +/xyz/openbmc_project/network/hypervisor/eth1/ipv4/addr0: + - Interface: xyz.openbmc_project.Network.IP + Properties: + Address: + Default: '"0.0.0.0"' + PrefixLength: + Default: 0 + Validation: + Type: "range" + Validator: 0..32 + Unit: "bits" + Origin: + Default: IP::AddressOrigin::Static + Type: + Default: IP::Protocol::IPv4 + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'false' + diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-rainier.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-rainier.override.yml deleted file mode 100644 index ecc95317f7..0000000000 --- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-rainier.override.yml +++ /dev/null @@ -1,74 +0,0 @@ -/xyz/openbmc_project/network/hypervisor: - - Interface: xyz.openbmc_project.Network.SystemConfiguration - Properties: - HostName: - Default: '""' - DefaultGateway: - Default: '"0.0.0.0"' - -/xyz/openbmc_project/network/hypervisor/eth0: - - Interface: xyz.openbmc_project.Network.MACAddress - Properties: - MACAddress: - Default: '"00:00:00:00:00:00"' - Validation: - Type: "regex" - Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' - - Interface: xyz.openbmc_project.Network.EthernetInterface - Properties: - DHCPEnabled: - Default: EthernetInterface::DHCPConf::none - -/xyz/openbmc_project/network/hypervisor/eth0/ipv4/addr0: - - Interface: xyz.openbmc_project.Network.IP - Properties: - Address: - Default: '"0.0.0.0"' - PrefixLength: - Default: 0 - Validation: - Type: "range" - Validator: 0..32 - Unit: "bits" - Origin: - Default: IP::AddressOrigin::Static - Type: - Default: IP::Protocol::IPv4 - - Interface: xyz.openbmc_project.Object.Enable - Properties: - Enabled: - Default: 'false' - -/xyz/openbmc_project/network/hypervisor/eth1: - - Interface: xyz.openbmc_project.Network.MACAddress - Properties: - MACAddress: - Default: '"00:00:00:00:00:00"' - Validation: - Type: "regex" - Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' - - Interface: xyz.openbmc_project.Network.EthernetInterface - Properties: - DHCPEnabled: - Default: EthernetInterface::DHCPConf::none - -/xyz/openbmc_project/network/hypervisor/eth1/ipv4/addr0: - - Interface: xyz.openbmc_project.Network.IP - Properties: - Address: - Default: '"0.0.0.0"' - PrefixLength: - Default: 0 - Validation: - Type: "range" - Validator: 0..32 - Unit: "bits" - Origin: - Default: IP::AddressOrigin::Static - Type: - Default: IP::Protocol::IPv4 - - Interface: xyz.openbmc_project.Object.Enable - Properties: - Enabled: - Default: 'false' - diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 3c658ae0c0..92c1bccaea 100644 --- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -3,5 +3,5 @@ SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml" SRC_URI_append_ibm-ac-server = " file://ClearHostSecurityKeys-default-zero.override.yml" SRC_URI_append_mihawk = " file://TPMEnable-default-true.override.yml" SRC_URI_append = " file://ibm_settings.override.yml" -SRC_URI_append_rainier = " file://HypervisorInterface-default-rainier.override.yml" +SRC_URI_append_p10bmc = " file://HypervisorInterface-default-p10bmc.override.yml" SRC_URI_append_witherspoon-tacoma = " file://HypervisorInterface-default-tacoma.override.yml" -- cgit v1.2.3