Merge branch 'gros68_disk' into 'master'

[nancy][gros] Replace SSD in gros-68

See merge request !106

data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json

@@ -227,16 +227,16 @@
       "vendor": "Micron"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x500a075121503a97",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e41522c8439",
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": "D1DF003",
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "MTFDDAK960TDN",
+      "model": "SSDSC2KG960G8R",
       "reservation": true,
       "size": 960197124096,
       "storage": "SSD",
-      "vendor": "Micron"
+      "vendor": "Intel"
     }
   ],
   "supported_job_types": {

input/grid5000/disks.yaml

@@ -51,6 +51,7 @@ disk_vendor_model_mapping:
     - INTEL SSDSC2BB30
     - SSDSC2KG480G7R
     - SSDSC2KG480G8R
+    - SSDSC2KG960G8R
   Fujitsu:
     - MAT3073NC
   Samsung:

input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml

@@ -71,10 +71,10 @@ gros-68:
       model: MTFDDAK480TDN
       size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x500a075121503a97"
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e41522c8439"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
-      firmware_version: D1DF003
-      model: MTFDDAK960TDN
       size: 960197124096
+      model: SSDSC2KG960G8R
+      firmware_version: XCV1DL67
   supported_job_types:
     virtual: ivt