From a368b828b84f280bdcbc28cd6e9da0caec3e860c Mon Sep 17 00:00:00 2001
From: Samir Noir <samir.noir@inria.fr>
Date: Wed, 6 Nov 2019 15:46:20 +0100
Subject: [PATCH] [disk][lyon] fix geminis' /dev/ disk assignment
---
.../lyon/clusters/gemini/nodes/gemini-1.json | 16 ++++++++--------
.../lyon/clusters/gemini/nodes/gemini-2.json | 12 ++++++------
.../lyon/clusters/gemini/nodes/gemini-1.yaml | 16 ++++++++--------
.../lyon/clusters/gemini/nodes/gemini-2.yaml | 12 ++++++------
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index 4a72c90986a..77943e17696 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -313,8 +313,8 @@
"vendor": "Samsung"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3474",
- "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0",
+ "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3472",
+ "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
"device": "sdb",
"driver": "megaraid_sas",
"firmware_version": "GXT5204Q",
@@ -326,8 +326,8 @@
"vendor": "Samsung"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3472",
- "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
+ "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf346b",
+ "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
"device": "sdc",
"driver": "megaraid_sas",
"firmware_version": "GXT5204Q",
@@ -339,8 +339,8 @@
"vendor": "Samsung"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3468",
- "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
+ "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3474",
+ "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0",
"device": "sdd",
"driver": "megaraid_sas",
"firmware_version": "GXT5204Q",
@@ -352,8 +352,8 @@
"vendor": "Samsung"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf346b",
- "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
+ "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3468",
+ "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
"device": "sde",
"driver": "megaraid_sas",
"firmware_version": "GXT5204Q",
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index 5316c50ae3c..938f51231c0 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -313,8 +313,8 @@
"vendor": "Samsung"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf345b",
- "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
+ "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3462",
+ "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
"device": "sdb",
"driver": "megaraid_sas",
"firmware_version": "GXT5204Q",
@@ -326,8 +326,8 @@
"vendor": "Samsung"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3462",
- "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
+ "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3469",
+ "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
"device": "sdc",
"driver": "megaraid_sas",
"firmware_version": "GXT5204Q",
@@ -352,8 +352,8 @@
"vendor": "Samsung"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3469",
- "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
+ "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf345b",
+ "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
"device": "sde",
"driver": "megaraid_sas",
"firmware_version": "GXT5204Q",
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
index 364a0f19c9a..554e6b9f81c 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -190,26 +190,26 @@ gemini-1:
model: SAMSUNG MZ7KM480
size: 480103981056
sdb:
- by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3474"
- by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
+ by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3472"
+ by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
firmware_version: GXT5204Q
model: SAMSUNG MZ7LM1T9
size: 1920383410176
sdc:
- by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3472"
- by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
+ by_id: "/dev/disk/by-id/wwn-0x5002538c40bf346b"
+ by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
firmware_version: GXT5204Q
model: SAMSUNG MZ7LM1T9
size: 1920383410176
sdd:
- by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3468"
- by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
+ by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3474"
+ by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
firmware_version: GXT5204Q
model: SAMSUNG MZ7LM1T9
size: 1920383410176
sde:
- by_id: "/dev/disk/by-id/wwn-0x5002538c40bf346b"
- by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
+ by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3468"
+ by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
firmware_version: GXT5204Q
model: SAMSUNG MZ7LM1T9
size: 1920383410176
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
index d96b07153d4..e0562a6ea03 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -190,14 +190,14 @@ gemini-2:
model: SAMSUNG MZ7KM480
size: 480103981056
sdb:
- by_id: "/dev/disk/by-id/wwn-0x5002538c40bf345b"
- by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
+ by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3462"
+ by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
firmware_version: GXT5204Q
model: SAMSUNG MZ7LM1T9
size: 1920383410176
sdc:
- by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3462"
- by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
+ by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3469"
+ by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
firmware_version: GXT5204Q
model: SAMSUNG MZ7LM1T9
size: 1920383410176
@@ -208,8 +208,8 @@ gemini-2:
model: SAMSUNG MZ7LM1T9
size: 1920383410176
sde:
- by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3469"
- by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
+ by_id: "/dev/disk/by-id/wwn-0x5002538c40bf345b"
+ by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
firmware_version: GXT5204Q
model: SAMSUNG MZ7LM1T9
size: 1920383410176
--
GitLab