From 2b431a8b7bd69abae407f2067d3ead54ff0d92da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Gaidamour?= <jeremie.gaidamour@inria.fr>
Date: Thu, 31 Mar 2016 10:20:06 +0200
Subject: [PATCH] [lyon] Updated hercule
---
.../sites/lyon/clusters/hercule/nodes/hercule-1.json | 5 ++++-
.../sites/lyon/clusters/hercule/nodes/hercule-2.json | 5 ++++-
.../sites/lyon/clusters/hercule/nodes/hercule-3.json | 5 ++++-
.../sites/lyon/clusters/hercule/nodes/hercule-4.json | 5 ++++-
dev/reference-api/reference-api.rb | 3 ++-
5 files changed, 18 insertions(+), 5 deletions(-)
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 b873de923d4..7a69a5457cb 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 23eed98667f..f051b287c8f 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 39cff190491..8bc501251e0 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 61090e3db5f..551fc7edd43 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 4df82bbff71..af3d43842dd 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"] ||= {}
--
GitLab