From 45899f02053863d5a6cb064bb0f6f8fb0b3916f9 Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Wed, 14 Sep 2022 17:21:49 +0200
Subject: [PATCH] [nancy/servan] Add disk by-path for kadeploy

---
 .../nancy/clusters/grat/nodes/grat-1.json     | 20 +------------------
 .../sites/nancy/clusters/grat/grat.yaml       | 14 +------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json b/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
index e351ab01ee8..efc1b7a9e9e 100644
--- a/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
+++ b/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
@@ -65,30 +65,12 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:64:00.0-sas-0x58ce38ee21ce500e-lun-0",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
       "storage": "SSD",
       "vendor": "Unknown"
-    },
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk1",
-      "interface": "SATA",
-      "model": "unknown",
-      "storage": "HDD",
-      "vendor": "Unknown"
-    },
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk2",
-      "interface": "NVME",
-      "model": "unknown",
-      "storage": "SSD",
-      "vendor": "Unknown"
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/sites/nancy/clusters/grat/grat.yaml b/input/grid5000/sites/nancy/clusters/grat/grat.yaml
index 5021754b505..3a254993984 100644
--- a/input/grid5000/sites/nancy/clusters/grat/grat.yaml
+++ b/input/grid5000/sites/nancy/clusters/grat/grat.yaml
@@ -50,16 +50,4 @@ nodes:
         interface: SAS
         storage: SSD
         model: unknown
-        by_path: "/dev/disk/by-path/dummy"
-      disk1:
-        id: disk1
-        interface: SATA
-        storage: HDD
-        model: unknown
-        by_path: "/dev/disk/by-path/dummy"
-      disk2:
-        id: disk2
-        interface: NVME
-        storage: SSD
-        model: unknown
-        by_path: "/dev/disk/by-path/dummy"
+        by_path: "/dev/disk/by-path/pci-0000:64:00.0-sas-0x58ce38ee21ce500e-lun-0"
-- 
GitLab