diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json index bb1974a16173f9d98753834cc6e8be22845873b7..5e1be964c3959b880414ec616988d424b60bd35f 100644 --- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json +++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json @@ -105,13 +105,23 @@ "storage_devices": [ { "by_id": "", - "by_path": "/dev/disk/by-path/dummy", + "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0", "id": "disk0", "interface": "SAS", "model": "unknown", "size": 8, "storage": "SSD", "vendor": "Unknown" + }, + { + "by_id": "", + "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0", + "id": "disk1", + "interface": "SSD", + "model": "unknown", + "size": 8, + "storage": "SSD", + "vendor": "Unknown" } ], "supported_job_types": { diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json index 79b99ddc6002e09d1764bb4a9c6a7815ac9ba600..731995a76c6814ef1231e04cc42a86a8bf1d66d6 100644 --- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json +++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json @@ -105,13 +105,23 @@ "storage_devices": [ { "by_id": "", - "by_path": "/dev/disk/by-path/dummy", + "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0", "id": "disk0", "interface": "SAS", "model": "unknown", "size": 8, "storage": "SSD", "vendor": "Unknown" + }, + { + "by_id": "", + "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0", + "id": "disk1", + "interface": "SSD", + "model": "unknown", + "size": 8, + "storage": "SSD", + "vendor": "Unknown" } ], "supported_job_types": { diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json index 0ed9dc86f5f4e19c05dbb5e4f37432082de0ddc2..eb7aea67984050208d3b374d938c8c220e4b1703 100644 --- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json +++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json @@ -105,13 +105,23 @@ "storage_devices": [ { "by_id": "", - "by_path": "/dev/disk/by-path/dummy", + "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0", "id": "disk0", "interface": "SAS", "model": "unknown", "size": 8, "storage": "SSD", "vendor": "Unknown" + }, + { + "by_id": "", + "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0", + "id": "disk1", + "interface": "SSD", + "model": "unknown", + "size": 8, + "storage": "SSD", + "vendor": "Unknown" } ], "supported_job_types": { diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json index 7e445bb9d97325c3c8710aa26ceb2cfeaf00ca8e..9480be2603070314a6a90078f2179f4d8b9b5949 100644 --- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json +++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json @@ -105,13 +105,23 @@ "storage_devices": [ { "by_id": "", - "by_path": "/dev/disk/by-path/dummy", + "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0", "id": "disk0", "interface": "SAS", "model": "unknown", "size": 8, "storage": "SSD", "vendor": "Unknown" + }, + { + "by_id": "", + "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0", + "id": "disk1", + "interface": "SSD", + "model": "unknown", + "size": 8, + "storage": "SSD", + "vendor": "Unknown" } ], "supported_job_types": { diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml index 1d411c3ef8988a594db93370f8479f271cfdd569..0013acdb5cc6cf02359b42dc4873dcbc3281c433 100644 --- a/input/grid5000/disks.yaml +++ b/input/grid5000/disks.yaml @@ -45,6 +45,7 @@ disk_vendor_model_mapping: - ST600MM0088 - ST600MP0005 - ST600MP0036 + - ST600MM0069 - ST2000NX0463 - ST4000NM0295 - ST8000NM0185 diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml index 2a0277f4a7d34661174cfac877053599fcdc040f..243fbba8a3f9558eb06fbe20d58e868fd59e37c9 100644 --- a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml +++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml @@ -30,10 +30,14 @@ nodes: mountable: true mounted: true storage_devices: - disk0: # This field will have to be renamed later. + disk0: id: disk0 interface: SAS - by_path: "/dev/disk/by-path/dummy" # this path will have to change later. + by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0" + disk1: + id: disk1 + interface: SSD + by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0" software: standard-environment: debian11-x64-std management_tools: diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb index b7c9a0c5b701655076448393cd817dfedae1ec5b..eb1a61795788d5dc461a4259148bcf09a3319863 100644 --- a/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb +++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb @@ -83,4 +83,8 @@ nodes: storage: SSD # Fake data, will be replaced by g5k-checks model: unknown # Fake data, will be replaced by g5k-checks size: 8 # Fake data, will be replaced by g5k-checks + disk1: + storage: SSD # Fake data, will be replaced by g5k-checks + model: unknown # Fake data, will be replaced by g5k-checks + size: 8 # Fake data, will be replaced by g5k-checks <% } %>