From 7fc4e5464831ba09b0515a7cbe4f947176bc6aaf Mon Sep 17 00:00:00 2001
From: Sebastien Philippot <sebastien.philippot@inria.fr>
Date: Mon, 17 Dec 2018 16:06:08 +0100
Subject: [PATCH] =?UTF-8?q?[rennes]=C2=A0fix=20nodes=20on=20parasilo-pdu-1?=
=?UTF-8?q?=20failed=20bug9905?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../clusters/parasilo/nodes/parasilo-16.json | 18 +--------
.../clusters/parasilo/nodes/parasilo-18.json | 16 +-------
.../clusters/parasilo/nodes/parasilo-20.json | 16 +-------
.../clusters/parasilo/nodes/parasilo-8.json | 16 +-------
.../clusters/parasilo/nodes/parasilo-9.json | 16 +-------
.../sites/rennes/pdus/parasilo-pdu-1.json | 25 +-----------
.../rennes/clusters/parasilo/parasilo.yaml | 3 --
.../clusters/parasilo/parasilo.yaml.erb | 7 ++++
.../clusters/parasilo/parasilo_pdu.yaml | 40 +++++++++----------
input/grid5000/sites/rennes/pdus.yaml | 13 +-----
10 files changed, 35 insertions(+), 135 deletions(-)
create mode 100644 input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
index 736b939af0b..5ade2fc509a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 5,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
@@ -286,4 +272,4 @@
},
"type": "node",
"uid": "parasilo-16"
-}
\ No newline at end of file
+}
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index 94f8a22dfad..1f6b0082125 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 4,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index 0caf8ab3acc..b67453fd7c5 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 3,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index 1cd29c67a2a..5c91b23f467 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 2,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index cc538f14f5e..be0a730e146 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 1,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json b/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json
index 2c6fe2b9151..77400ac754e 100644
--- a/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json
+++ b/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json
@@ -1,32 +1,9 @@
{
"ip": "172.17.97.201",
- "model": "AP8659",
"ports": {
- "1": "parasilo-9",
- "2": "parasilo-8",
- "3": "parasilo-20",
- "4": "parasilo-18",
- "5": "parasilo-16",
"6": "paravance-1",
"7": "paravance-2"
},
- "sensors": [
- {
- "power": {
- "per_outlets": false,
- "resolution": 1,
- "snmp": {
- "available": true,
- "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7",
- "total_oids": [
- "iso.3.6.1.4.1.318.1.1.12.1.16.0"
- ],
- "unit": "W"
- }
- }
- }
- ],
"type": "pdu",
- "uid": "parasilo-pdu-1",
- "vendor": "APC"
+ "uid": "parasilo-pdu-1"
}
\ No newline at end of file
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
index 176c516b9ae..ffd05505e8d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -8,9 +8,6 @@ queues:
nodes:
parasilo-[1-28]:
- monitoring:
- wattmeter: true
- metric: power
processor:
microarchitecture: Haswell
performance:
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb
new file mode 100644
index 00000000000..c170ffd1fd0
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb
@@ -0,0 +1,7 @@
+nodes:
+<% [1,2,3,4,5,6,7,10,11,12,13,14,15,17,19,21,22,23,24,25,26,27,28].each { |i| %>
+ parasilo-<%= i %>:
+ monitoring:
+ wattmeter: true
+ metric: power
+<% } %>
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml
index 6ca4f524ba6..b0ede793583 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml
@@ -28,14 +28,14 @@ nodes:
pdu:
- uid: parasilo-pdu-2
port: 1
- parasilo-8:
- pdu:
- - uid: parasilo-pdu-1
- port: 2
- parasilo-9:
- pdu:
- - uid: parasilo-pdu-1
- port: 1
+# parasilo-8:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 2
+# parasilo-9:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 1
parasilo-10:
pdu:
- uid: parasilo-pdu-2
@@ -60,26 +60,26 @@ nodes:
pdu:
- uid: parasilo-pdu-4
port: 3
- parasilo-16:
- pdu:
- - uid: parasilo-pdu-1
- port: 5
+# parasilo-16:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 5
parasilo-17:
pdu:
- uid: parasilo-pdu-2
port: 5
- parasilo-18:
- pdu:
- - uid: parasilo-pdu-1
- port: 4
+# parasilo-18:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 4
parasilo-19:
pdu:
- uid: parasilo-pdu-2
port: 4
- parasilo-20:
- pdu:
- - uid: parasilo-pdu-1
- port: 3
+# parasilo-20:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 3
parasilo-21:
pdu:
- uid: parasilo-pdu-4
diff --git a/input/grid5000/sites/rennes/pdus.yaml b/input/grid5000/sites/rennes/pdus.yaml
index 728def19558..1fe906f2ff7 100644
--- a/input/grid5000/sites/rennes/pdus.yaml
+++ b/input/grid5000/sites/rennes/pdus.yaml
@@ -42,19 +42,8 @@ pdus:
outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
resolution: 1
- parasilo-pdu-[1-1]:
+ parasilo-pdu-1:
vendor: APC
- model: AP8659
- sensors:
- - power:
- per_outlets: false
- snmp:
- available: true
- total_oids:
- - iso.3.6.1.4.1.318.1.1.12.1.16.0
- unit: W
- outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
- resolution: 1
parasilo-pdu-[2-4]:
vendor: APC
--
GitLab