From c1e9c780bd1cbeedb0ca65df6282bb1ae6c249d7 Mon Sep 17 00:00:00 2001
From: PHILIPPOT Sebastien <sebastien.philippot@irisa.fr>
Date: Mon, 17 Feb 2020 14:07:40 +0100
Subject: [PATCH] [rennes] fix disc order required for test_g5k-checks for
paranoia-1
---
.../clusters/paranoia/nodes/paranoia-1.json | 16 ++++++-------
.../clusters/paranoia/nodes/paranoia-1.yaml | 24 +++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
index e19defe408..97dcb5bc2c 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -223,8 +223,8 @@
"vendor": "Western Digital"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x50000c0f02df0970",
- "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
+ "by_id": "/dev/disk/by-id/wwn-0x50000c0f02df100c",
+ "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
"device": "sdb",
"driver": "ahci",
"firmware_version": "D1S6",
@@ -237,8 +237,8 @@
"vendor": "Western Digital"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x50000c0f0288cdc8",
- "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
+ "by_id": "/dev/disk/by-id/wwn-0x50000c0f02df0970",
+ "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
"device": "sdc",
"driver": "ahci",
"firmware_version": "D1S6",
@@ -251,8 +251,8 @@
"vendor": "Western Digital"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x50000c0f0288e114",
- "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
+ "by_id": "/dev/disk/by-id/wwn-0x50000c0f0288cdc8",
+ "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
"device": "sdd",
"driver": "ahci",
"firmware_version": "D1S6",
@@ -265,8 +265,8 @@
"vendor": "Western Digital"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x50000c0f02df100c",
- "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
+ "by_id": "/dev/disk/by-id/wwn-0x50000c0f0288e114",
+ "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
"device": "sde",
"driver": "ahci",
"firmware_version": "D1S6",
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index 860ded69c8..9fafdd206b 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -84,33 +84,33 @@ paranoia-1:
vendor: Intel
version: E5-2660 v2
storage_devices:
- sdb:
- by_id: "/dev/disk/by-id/wwn-0x50000c0f02df0970"
- by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
- firmware_version: D1S6
- model: WD6001BKHG
- size: 600127266816
sda:
by_id: "/dev/disk/by-id/wwn-0x50000c0f02df1a80"
by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
firmware_version: D1S6
model: WD6001BKHG
size: 600127266816
+ sdb:
+ by_id: "/dev/disk/by-id/wwn-0x50000c0f02df100c"
+ by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
+ firmware_version: D1S6
+ model: WD6001BKHG
+ size: 600127266816
sdc:
- by_id: "/dev/disk/by-id/wwn-0x50000c0f0288cdc8"
- by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
+ by_id: "/dev/disk/by-id/wwn-0x50000c0f02df0970"
+ by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
firmware_version: D1S6
model: WD6001BKHG
size: 600127266816
sdd:
- by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e114"
- by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
+ by_id: "/dev/disk/by-id/wwn-0x50000c0f0288cdc8"
+ by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
firmware_version: D1S6
model: WD6001BKHG
size: 600127266816
sde:
- by_id: "/dev/disk/by-id/wwn-0x50000c0f02df100c"
- by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
+ by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e114"
+ by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
firmware_version: D1S6
model: WD6001BKHG
size: 600127266816
--
GitLab