Commit 2b431a8b authored by Jérémie Gaidamour's avatar Jérémie Gaidamour
Browse files

[lyon] Updated hercule

parent b933a5ac
......@@ -14,8 +14,11 @@
"name": "PowerEdge C6220",
"serial": "JQ3HD5J"
},
"gpu": {
"gpu": false
},
"main_memory": {
"ram_size": 34359738368,
"ram_size": 33285996544,
"virtual_size": null
},
"monitoring": {
......
......@@ -14,8 +14,11 @@
"name": "PowerEdge C6220",
"serial": "HQ3HD5J"
},
"gpu": {
"gpu": false
},
"main_memory": {
"ram_size": 34359738368,
"ram_size": 33285996544,
"virtual_size": null
},
"monitoring": {
......
......@@ -14,8 +14,11 @@
"name": "PowerEdge C6220",
"serial": "FQ3HD5J"
},
"gpu": {
"gpu": false
},
"main_memory": {
"ram_size": 34359738368,
"ram_size": 33285996544,
"virtual_size": null
},
"monitoring": {
......
......@@ -14,8 +14,11 @@
"name": "PowerEdge C6220",
"serial": "GQ3HD5J"
},
"gpu": {
"gpu": false
},
"main_memory": {
"ram_size": 34359738368,
"ram_size": 33285996544,
"virtual_size": null
},
"monitoring": {
......
......@@ -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"] ||= {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment