From 36ec84829faefec9476c1cc5f9f56c721b5cfc12 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 16:45:39 +0000 Subject: ibm: network: Replace rainier with p10bmc The IBM rainier machine name is being replaced with the generic p10bmc. Change-Id: Ic76f6202f9ae43440e5e6a793ca835a45d6ab088 Signed-off-by: Adriana Kobylak --- .../network/network/p10bmc/inventory-object-map.json | 4 ++++ .../network/network/p10bmc/ncsi-netlink.service | 12 ++++++++++++ .../network/network/rainier/inventory-object-map.json | 4 ---- .../network/network/rainier/ncsi-netlink.service | 12 ------------ .../recipes-phosphor/network/phosphor-network_%.bbappend | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/network/network/p10bmc/inventory-object-map.json create mode 100644 meta-ibm/recipes-phosphor/network/network/p10bmc/ncsi-netlink.service delete mode 100644 meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json delete mode 100644 meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service (limited to 'meta-ibm/recipes-phosphor') diff --git a/meta-ibm/recipes-phosphor/network/network/p10bmc/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/p10bmc/inventory-object-map.json new file mode 100644 index 000000000..08bb92aed --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/p10bmc/inventory-object-map.json @@ -0,0 +1,4 @@ +{ + "eth0":"ethernet0", + "eth1":"ethernet1" +} diff --git a/meta-ibm/recipes-phosphor/network/network/p10bmc/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/p10bmc/ncsi-netlink.service new file mode 100644 index 000000000..890551e7a --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/p10bmc/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json deleted file mode 100644 index 08bb92aed..000000000 --- a/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "eth0":"ethernet0", - "eth1":"ethernet1" -} diff --git a/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service deleted file mode 100644 index 890551e7a..000000000 --- a/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Stop the ethernet link failover -After=network.service - -[Service] -Restart=no -ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 -SyslogIdentifier=ncsi-netlink -Type=oneshot - -[Install] -WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend index 150d373e6..cf88f2282 100644 --- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend @@ -13,8 +13,8 @@ install_network_configuration(){ install -m 0644 ${WORKDIR}/inventory-object-map.json ${D}${datadir}/network/config.json } -SRC_URI_append_rainier = " file://inventory-object-map.json" -do_install_append_rainier(){ +SRC_URI_append_p10bmc = " file://inventory-object-map.json" +do_install_append_p10bmc(){ install_network_configuration } -- cgit v1.2.3