Merge branch 'bug16252' into 'master'

[lille][chiclet] Remove disk 2 of chiclet

See merge request !823

data/grid5000/accesses/refrepo.json

@@ -16106,18 +16106,6 @@
                   "size": 4000787030016,
                   "storage": "HDD",
                   "vendor": "Seagate"
-                },
-                {
-                  "by_id": "/dev/disk/by-id/wwn-0x5000c500a64ec817",
-                  "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
-                  "firmware_version": "DT32",
-                  "id": "disk2",
-                  "interface": "SAS",
-                  "model": "ST4000NM0295",
-                  "reservation": true,
-                  "size": 4000787030016,
-                  "storage": "HDD",
-                  "vendor": "Seagate"
                 }
               ],
               "uid": "chiclet-8"

data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json

@@ -284,18 +284,6 @@
       "size": 4000787030016,
       "storage": "HDD",
       "vendor": "Seagate"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500a64ec817",
-      "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
-      "firmware_version": "DT32",
-      "id": "disk2",
-      "interface": "SAS",
-      "model": "ST4000NM0295",
-      "reservation": true,
-      "size": 4000787030016,
-      "storage": "HDD",
-      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {

input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml

@@ -37,6 +37,8 @@ nodes:
         enabled: true
         mountable: true
         mounted: false
+    nodeset: chiclet
+  chiclet-[1-7]: 
     storage_devices:
       pci-0000:61:00.0-scsi-0:0:0:0:
         interface: SAS
@@ -49,4 +51,12 @@ nodes:
         interface: SAS
         id: disk2
         reservation: true
-    nodeset: chiclet
+  chiclet-8:
+    storage_devices:
+      pci-0000:61:00.0-scsi-0:0:0:0:
+        interface: SAS
+        id: disk0
+      pci-0000:61:00.0-scsi-0:0:1:0:
+        interface: SAS
+        id: disk1
+        reservation: true

input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml

@@ -107,12 +107,5 @@ chiclet-8:
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
-    pci-0000:61:00.0-scsi-0:0:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec817"
-      by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
-      firmware_version: DT32
-      model: ST4000NM0295
-      size: 4000787030016
-      storage: HDD
   supported_job_types:
     virtual: amd-v

lib/refrepo/valid/data/homogeneity.yaml.erb

@@ -85,6 +85,8 @@ grenoble:
     - -storage_devices.pci-0000:59:00.0-nvme-1
     - +storage_devices.pci-0000:ed:00.0-nvme-1
 lille:
+  chiclet-8:
+    - -storage_devices.pci-0000:61:00.0-scsi-0:0:2:0
   chifflot-2:
     - ~storage_devices.pci-0000:18:00.0-scsi-0:0:3:0.firmware_version
     - ~storage_devices.pci-0000:18:00.0-scsi-0:0:3:0.model