From ef21a2e40866c1454f4743d9b9b591f1767dc487 Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Mon, 22 Feb 2021 14:17:10 +0100
Subject: [PATCH] [grouille/disk] Remove sdb - rework on g5k-disk-manager

---
 .../nancy/clusters/grouille/nodes/grouille-1.json     | 11 -----------
 .../nancy/clusters/grouille/nodes/grouille-2.json     | 11 -----------
 .../sites/nancy/clusters/grouille/grouille.yaml       |  3 ---
 .../nancy/clusters/grouille/nodes/grouille-1.yaml     |  6 ------
 .../nancy/clusters/grouille/nodes/grouille-2.yaml     |  6 ------
 5 files changed, 37 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 c9f3522b6df..a22b0290f0d 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
@@ -212,17 +212,6 @@
       "size": 1920383410176,
       "storage": "SSD",
       "vendor": "Toshiba"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a075129de046c",
-      "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
-      "device": "sdb",
-      "firmware_version": "D3DJ004",
-      "interface": "SATA",
-      "model": "MTFDDAK960TDT",
-      "size": 960197124096,
-      "storage": "SSD",
-      "vendor": "Micron"
     }
   ],
   "supported_job_types": {
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 28f53f93368..385d717464e 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
@@ -212,17 +212,6 @@
       "size": 1920383410176,
       "storage": "SSD",
       "vendor": "Toshiba"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a075129de049a",
-      "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
-      "device": "sdb",
-      "firmware_version": "D3DJ004",
-      "interface": "SATA",
-      "model": "MTFDDAK960TDT",
-      "size": 960197124096,
-      "storage": "SSD",
-      "vendor": "Micron"
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
index 5be690ffea2..775a9d5265e 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
@@ -42,6 +42,3 @@ nodes:
       sda:
         interface: SAS
         storage: SSD
-      sdb:
-        interface: SATA
-        storage: SSD
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 27c3761e7a4..36184b68552 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -104,11 +104,5 @@ grouille-1:
       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:0:0"
-      firmware_version: D3DJ004
-      model: MTFDDAK960TDT
-      size: 960197124096
   supported_job_types:
     virtual: amd-v
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 21b0d693721..ba6b903ca5c 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -104,11 +104,5 @@ grouille-2:
       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:0:0"
-      firmware_version: D3DJ004
-      model: MTFDDAK960TDT
-      size: 960197124096
   supported_job_types:
     virtual: amd-v
-- 
GitLab