From 2b122e58d516bbc8ebca8987cc7ed8150729c601 Mon Sep 17 00:00:00 2001 From: BERARD Benjamin <benjamin.berard@inria.fr> Date: Thu, 25 Feb 2021 14:42:31 +0100 Subject: [PATCH] [nancy/grouille] Add sdb and reservation disk in api --- .../nancy/clusters/grouille/nodes/grouille-1.json | 12 ++++++++++++ .../nancy/clusters/grouille/nodes/grouille-2.json | 12 ++++++++++++ .../sites/nancy/clusters/grouille/grouille.yaml | 4 ++++ .../nancy/clusters/grouille/nodes/grouille-1.yaml | 6 ++++++ .../nancy/clusters/grouille/nodes/grouille-2.yaml | 6 ++++++ 5 files changed, 40 insertions(+) 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 a22b0290f0d..349b882a691 100644 --- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json +++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json @@ -212,6 +212,18 @@ "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:2:0", + "device": "sdb", + "firmware_version": "D3DJ004", + "interface": "SATA", + "model": "MTFDDAK960TDT", + "reservation": true, + "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 385d717464e..35b240d065f 100644 --- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json +++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json @@ -212,6 +212,18 @@ "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:2:0", + "device": "sdb", + "firmware_version": "D3DJ004", + "interface": "SATA", + "model": "MTFDDAK960TDT", + "reservation": true, + "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 775a9d5265e..25e6e66a97b 100644 --- a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml +++ b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml @@ -42,3 +42,7 @@ nodes: sda: interface: SAS storage: SSD + sdb: + interface: SATA + storage: SSD + reservation: true 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 36184b68552..5b9d70cdc02 100644 --- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml +++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml @@ -104,5 +104,11 @@ grouille-1: 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:2: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 ba6b903ca5c..a8b5a9729fe 100644 --- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml +++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml @@ -104,5 +104,11 @@ grouille-2: 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:2:0" + firmware_version: D3DJ004 + model: MTFDDAK960TDT + size: 960197124096 supported_job_types: virtual: amd-v -- GitLab