[toulouse][montcalm] Disks homogeneisation.

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json

@@ -158,12 +158,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0254c42e5",
+      "by_id": "/dev/disk/by-id/wwn-0x500a07513c09f607",
       "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
-      "firmware_version": "HPG2",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "VK000960GZCNF",
+      "model": "VK000960GXAWL",
       "size": 960197124096,
       "storage": "SSD",
       "vendor": "HP"

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json

@@ -158,12 +158,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0254c42e6",
+      "by_id": "/dev/disk/by-id/wwn-0x500a07513c09f6e9",
       "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
-      "firmware_version": "HPG2",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "VK000960GZCNF",
+      "model": "VK000960GXAWL",
       "size": 960197124096,
       "storage": "SSD",
       "vendor": "HP"

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json

@@ -158,12 +158,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0254c42e9",
+      "by_id": "/dev/disk/by-id/wwn-0x500a07513c09f806",
       "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
-      "firmware_version": "HPG2",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "VK000960GZCNF",
+      "model": "VK000960GXAWL",
       "size": 960197124096,
       "storage": "SSD",
       "vendor": "HP"

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json

@@ -158,12 +158,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0254c42e8",
+      "by_id": "/dev/disk/by-id/wwn-0x500a07513c09f5ab",
       "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
-      "firmware_version": "HPG2",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "VK000960GZCNF",
+      "model": "VK000960GXAWL",
       "size": 960197124096,
       "storage": "SSD",
       "vendor": "HP"

input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.yaml

@@ -93,10 +93,10 @@ montcalm-3:
     version: Silver 4314
   storage_devices:
     pci-0000:00:17.0-ata-1:
-      by_id: "/dev/disk/by-id/wwn-0x5ace42e0254c42e5"
+      by_id: "/dev/disk/by-id/wwn-0x500a07513c09f607"
       by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
-      firmware_version: HPG2
-      model: VK000960GZCNF
+      firmware_version: HPG1
+      model: VK000960GXAWL
       size: 960197124096
       storage: SSD
   supported_job_types:

input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.yaml

@@ -93,10 +93,10 @@ montcalm-5:
     version: Silver 4314
   storage_devices:
     pci-0000:00:17.0-ata-1:
-      by_id: "/dev/disk/by-id/wwn-0x5ace42e0254c42e6"
+      by_id: "/dev/disk/by-id/wwn-0x500a07513c09f6e9"
       by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
-      firmware_version: HPG2
-      model: VK000960GZCNF
+      firmware_version: HPG1
+      model: VK000960GXAWL
       size: 960197124096
       storage: SSD
   supported_job_types:

input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.yaml

@@ -93,10 +93,10 @@ montcalm-6:
     version: Silver 4314
   storage_devices:
     pci-0000:00:17.0-ata-1:
-      by_id: "/dev/disk/by-id/wwn-0x5ace42e0254c42e9"
+      by_id: "/dev/disk/by-id/wwn-0x500a07513c09f806"
       by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
-      firmware_version: HPG2
-      model: VK000960GZCNF
+      firmware_version: HPG1
+      model: VK000960GXAWL
       size: 960197124096
       storage: SSD
   supported_job_types:

input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.yaml

@@ -93,10 +93,10 @@ montcalm-8:
     version: Silver 4314
   storage_devices:
     pci-0000:00:17.0-ata-1:
-      by_id: "/dev/disk/by-id/wwn-0x5ace42e0254c42e8"
+      by_id: "/dev/disk/by-id/wwn-0x500a07513c09f5ab"
       by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
-      firmware_version: HPG2
-      model: VK000960GZCNF
+      firmware_version: HPG1
+      model: VK000960GXAWL
       size: 960197124096
       storage: SSD
   supported_job_types:

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

@@ -248,10 +248,3 @@ sophia:
   uvb-13:
     - -chassis.serial
     - ~chassis.manufacturer
-toulouse:
-  montcalm-[3-5]:
-    - ~storage_devices.pci-0000:00:17.0-ata-1.firmware_version
-    - ~storage_devices.pci-0000:00:17.0-ata-1.model
-  montcalm-[7-9]:
-    - ~storage_devices.pci-0000:00:17.0-ata-1.firmware_version
-    - ~storage_devices.pci-0000:00:17.0-ata-1.model