From eab3d0e7e1da760a63746057e8d219e7593459ec Mon Sep 17 00:00:00 2001
From: Saint-Marcel Frederic <frederic.saint-marcel@inria.fr>
Date: Tue, 27 Nov 2018 11:47:44 +0100
Subject: [PATCH] [grenoble] add yeti cluster nvme disks

---
 .../sites/grenoble/clusters/yeti/nodes/yeti-1.json | 14 ++++++++++++++
 .../sites/grenoble/clusters/yeti/nodes/yeti-2.json | 14 ++++++++++++++
 .../sites/grenoble/clusters/yeti/nodes/yeti-3.json | 14 ++++++++++++++
 .../sites/grenoble/clusters/yeti/nodes/yeti-4.json | 14 ++++++++++++++
 .../sites/grenoble/clusters/yeti/nodes/yeti-1.yaml | 10 ++++++++++
 .../sites/grenoble/clusters/yeti/nodes/yeti-2.yaml | 10 ++++++++++
 .../sites/grenoble/clusters/yeti/nodes/yeti-3.yaml | 10 ++++++++++
 .../sites/grenoble/clusters/yeti/nodes/yeti-4.yaml | 10 ++++++++++
 8 files changed, 96 insertions(+)

diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
index a99fe1cc8ed..37f6cf3977d 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
@@ -224,6 +224,20 @@
       "size": 1999844147200,
       "storage": "HDD",
       "vendor": "DELL"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb3",
+      "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
+      "device": "nvme0n1",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bad",
+      "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1",
+      "device": "nvme1n1",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
index 36891e5e5dc..3370c7d6606 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
@@ -224,6 +224,20 @@
       "size": 1999844147200,
       "storage": "HDD",
       "vendor": "DELL"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389571001020",
+      "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
+      "device": "nvme0n1",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000baf",
+      "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1",
+      "device": "nvme1n1",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
index e506e81cb65..a2613f0fa6c 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
@@ -224,6 +224,20 @@
       "size": 1999844147200,
       "storage": "HDD",
       "vendor": "DELL"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.002538957100101f",
+      "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
+      "device": "nvme0n1",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb6",
+      "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1",
+      "device": "nvme1n1",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
index 8326bfeae7c..cb686b75838 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
@@ -224,6 +224,20 @@
       "size": 1999844147200,
       "storage": "HDD",
       "vendor": "DELL"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb5",
+      "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
+      "device": "nvme0n1",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.002538957100101b",
+      "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1",
+      "device": "nvme1n1",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index 7b54c1401f8..cafa65d9a19 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -90,6 +90,16 @@ yeti-1:
     vendor: Intel
     version: Gold 6130
   storage_devices:
+    nvme0n1:
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb3"
+      by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
+    nvme1n1:
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000bad"
+      by_path: "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
     sda:
       by_id: "/dev/disk/by-id/wwn-0x6d09466030a09c00223ab220cfc3b8e0"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index 69035301adc..21fbe32c466 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -90,6 +90,16 @@ yeti-2:
     vendor: Intel
     version: Gold 6130
   storage_devices:
+    nvme0n1:
+      by_id: "/dev/disk/by-id/nvme-eui.0025389571001020"
+      by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
+    nvme1n1:
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000baf"
+      by_path: "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
     sda:
       by_id: "/dev/disk/by-id/wwn-0x6d09466030bbc60023762be4210faa5e"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index a87c884c535..237c6d96875 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -90,6 +90,16 @@ yeti-3:
     vendor: Intel
     version: Gold 6130
   storage_devices:
+    nvme0n1:
+      by_id: "/dev/disk/by-id/nvme-eui.002538957100101f"
+      by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
+    nvme1n1:
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb6"
+      by_path: "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
     sda:
       by_id: "/dev/disk/by-id/wwn-0x6d09466030a3cb00223b92d7caa2ee25"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index edbbd72d98e..7659e2be15c 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -90,6 +90,16 @@ yeti-4:
     vendor: Intel
     version: Gold 6130
   storage_devices:
+    nvme0n1:
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb5"
+      by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
+    nvme1n1:
+      by_id: "/dev/disk/by-id/nvme-eui.002538957100101b"
+      by_path: "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
     sda:
       by_id: "/dev/disk/by-id/wwn-0x6d09466030bbb700223ab55ccfde5c8a"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
-- 
GitLab