diff --git a/data/grid5000/sites/sophia/clusters/esterel4/esterel4.json b/data/grid5000/sites/sophia/clusters/esterel4/esterel4.json index 0983121f8a5b34d0c2098316a1766c88bcb6d983..28296fbef437bdc0b8693fbe2794db1ae0a02711 100644 --- a/data/grid5000/sites/sophia/clusters/esterel4/esterel4.json +++ b/data/grid5000/sites/sophia/clusters/esterel4/esterel4.json @@ -53,7 +53,7 @@ ], "model": "Dell PowerEdge T630", "nodes_count": 1, - "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 1Gb Ethernet", + "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 2x0GB SSD, 1 x 1Gb Ethernet", "priority": 201606, "queues": [ "admin", diff --git a/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json b/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json index ca7bf79aba14ce116136f033ca607da552851d7d..f672275b983fd4d4ab1f8501bf5be5130f836619 100644 --- a/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json +++ b/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-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:03: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:03:00.0-scsi-0:2:1:0", + "id": "disk1", + "interface": "SATA", + "model": "unknown", + "size": 8, + "storage": "SSD", + "vendor": "Unknown" } ], "supported_job_types": { diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml index 76aa13a84a43ad0a01439e4a9f149c15620275b2..5aa6a7d5e65aae13b0a5e5fdd059076999f88acf 100644 --- a/input/grid5000/disks.yaml +++ b/input/grid5000/disks.yaml @@ -92,6 +92,7 @@ disk_vendor_model_mapping: - SSDSC2KG480G8R - SSDSC2KG960G8R - INTEL SSDSC2BB30 + - INTEL SSDSC2BX01 Hitachi: - HITACHI HUA7250S HP: diff --git a/input/grid5000/sites/sophia/clusters/esterel4/esterel4.yaml b/input/grid5000/sites/sophia/clusters/esterel4/esterel4.yaml index 72e9444582334d0f63f8760bc265a2b0a0da494e..b28df4e29bfa45f5bc4715e6c162e48fe5a72e44 100644 --- a/input/grid5000/sites/sophia/clusters/esterel4/esterel4.yaml +++ b/input/grid5000/sites/sophia/clusters/esterel4/esterel4.yaml @@ -30,12 +30,16 @@ 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:03:00.0-scsi-0:2:0:0" + disk1: + id: disk1 + interface: SATA + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0" software: - standard-environment: debian11-x64-std # TODO: check that architecture is OK + standard-environment: debian11-x64-std management_tools: bmc_vendor_tool: racadm nodeset: esterel4 diff --git a/input/grid5000/sites/sophia/clusters/esterel4/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel4/nodes.yaml.erb index f0f61d7cef597720018cc28795fe3dca58b54839..a737e315869d7673d82743eb068fdfc25b608d59 100644 --- a/input/grid5000/sites/sophia/clusters/esterel4/nodes.yaml.erb +++ b/input/grid5000/sites/sophia/clusters/esterel4/nodes.yaml.erb @@ -77,4 +77,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 <% } %>