diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json index b873de923d473b7b86f34d61c08b9136abffff29..7a69a5457cb2a46774ebe87f3e964d0e6b0a8672 100644 --- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json +++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json @@ -14,8 +14,11 @@ "name": "PowerEdge C6220", "serial": "JQ3HD5J" }, + "gpu": { + "gpu": false + }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json index 23eed98667fc498326355b883016a25dd4b4c2ba..f051b287c8ffd7d9eb2a5bc40ef4b313030dc64a 100644 --- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json +++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json @@ -14,8 +14,11 @@ "name": "PowerEdge C6220", "serial": "HQ3HD5J" }, + "gpu": { + "gpu": false + }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json index 39cff1904917804a2b50f25a52d5affae4c6f93a..8bc501251e09841f705273217a69fc183911f96e 100644 --- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json +++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json @@ -14,8 +14,11 @@ "name": "PowerEdge C6220", "serial": "FQ3HD5J" }, + "gpu": { + "gpu": false + }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json index 61090e3db5f48e77b962349685a15e74a9d5c929..551fc7edd43c87cb173f26c9c221905217ad1a59 100644 --- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json +++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json @@ -14,8 +14,11 @@ "name": "PowerEdge C6220", "serial": "GQ3HD5J" }, + "gpu": { + "gpu": false + }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { diff --git a/dev/reference-api/reference-api.rb b/dev/reference-api/reference-api.rb index 4df82bbff71c78b5b5a5e622d4fc850f35d00ace..af3d43842dd3ce7e13db7d13890e64141d696cf9 100644 --- a/dev/reference-api/reference-api.rb +++ b/dev/reference-api/reference-api.rb @@ -120,13 +120,14 @@ global_hash["sites"].each do |site_uid, site| network_adapter["switch"], network_adapter["switch_port"] = net_switch_port_lookup(site, node_uid, network_adapter["device"]) || net_switch_port_lookup(site, node_uid) else # Secondary network_adapter(s) - network_adapter["network_address"] = "#{node_uid}-#{network_adapter["device"]}.#{site_uid}.grid5000.fr" if network_adapter["enabled"] && network_adapter["mountable"] + network_adapter["network_address"] = "#{node_uid}-#{network_adapter["device"]}.#{site_uid}.grid5000.fr" if network_adapter["enabled"] && network_adapter["mountable"] && !network_adapter.key?("network_address") if network_adapter["mountable"] switch, port = net_switch_port_lookup(site, node_uid, network_adapter["device"]) network_adapter["switch"] = switch if switch network_adapter["switch_port"] = port if port end end + network_adapter.delete("network_address") if network_adapter["network_address"] == 'none' } node["sensors"] ||= {}