From 7ea01c8e5e26cf57bb5c872da336e9592e986ec5 Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Tue, 16 Feb 2021 17:01:02 +0100
Subject: [PATCH] [nancy/grouille] Fix g5k-checks yaml file and data
---
.../sites/nancy/clusters/grouille/nodes/grouille-1.json | 4 ++--
.../sites/nancy/clusters/grouille/nodes/grouille-2.json | 4 ++--
input/grid5000/disks.yaml | 1 +
.../sites/nancy/clusters/grouille/nodes/grouille-1.yaml | 4 ++--
.../sites/nancy/clusters/grouille/nodes/grouille-2.yaml | 4 ++--
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
index b1ab6f38176..c9f3522b6df 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
@@ -204,7 +204,7 @@
"storage_devices": [
{
"by_id": "/dev/disk/by-id/wwn-0x58ce38ee20f6cc95",
- "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
+ "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0",
"device": "sda",
"firmware_version": "B709",
"interface": "SAS",
@@ -215,7 +215,7 @@
},
{
"by_id": "/dev/disk/by-id/wwn-0x500a075129de046c",
- "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0",
+ "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
"device": "sdb",
"firmware_version": "D3DJ004",
"interface": "SATA",
diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
index c32695eadd9..28f53f93368 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
@@ -204,7 +204,7 @@
"storage_devices": [
{
"by_id": "/dev/disk/by-id/wwn-0x58ce38ee20f6cc9d",
- "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
+ "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0",
"device": "sda",
"firmware_version": "B709",
"interface": "SAS",
@@ -215,7 +215,7 @@
},
{
"by_id": "/dev/disk/by-id/wwn-0x500a075129de049a",
- "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0",
+ "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
"device": "sdb",
"firmware_version": "D3DJ004",
"interface": "SATA",
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 845269cc13f..45a6f24a97a 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -10,6 +10,7 @@ disk_vendor_model_mapping:
- PERC H710i
- PERC H730 Mini
- PERC H730P Adp
+ - PERC H345 Front
Unknown:
- unknown
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
index e6f3e260a82..27c3761e7a4 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -100,13 +100,13 @@ grouille-1:
storage_devices:
sda:
by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc95"
- by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
+ by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
firmware_version: B709
model: KRM5XVUG1T92
size: 1920383410176
sdb:
by_id: "/dev/disk/by-id/wwn-0x500a075129de046c"
- by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
+ by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
firmware_version: D3DJ004
model: MTFDDAK960TDT
size: 960197124096
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
index fcf842c375e..21b0d693721 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -100,13 +100,13 @@ grouille-2:
storage_devices:
sda:
by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc9d"
- by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
+ by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
firmware_version: B709
model: KRM5XVUG1T92
size: 1920383410176
sdb:
by_id: "/dev/disk/by-id/wwn-0x500a075129de049a"
- by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
+ by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
firmware_version: D3DJ004
model: MTFDDAK960TDT
size: 960197124096
--
GitLab