From 0599e8986037e8f38d4d9ac4d12b385e0c8b76d3 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Wed, 9 Sep 2020 10:39:03 +0200
Subject: [PATCH] [nancy][grappe] Fix wattmeter value to multiplewq
---
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json | 2 +-
data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json | 2 +-
input/grid5000/sites/nancy/clusters/grappe/grappe.yaml | 2 --
17 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
index c6825d51f1c..85646ca1f3b 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
index c83fc62bcd4..4fa732d5894 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
index 32500317336..47af027eca3 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
index 8e4e689e7ae..582c3b7bcde 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
index 86519c4ae14..de52db63792 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
index 045e8c262cc..20b4a9215af 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
index 52f7ea92d79..c07a5a86b4d 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
index ebacde563a5..af71dfdc8f8 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
index cc1a4b1afd3..10fb3a026e9 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
index 186e17a6bde..d0696faa421 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
index 965d20b13c7..ee348e9627c 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
index 2a1aab8a209..e514c04e5d7 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
index 32f11a9fb20..913c8455a22 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
index 06981a43b6b..7197737981e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
index 0bba490e60d..7759282fb6d 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
index 423ce7a078f..b4f30cf16ca 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
index 6bc81e77faa..8ac0af2a3d2 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
@@ -60,8 +60,6 @@ nodes:
storage: HDD
#model: PERC H330 Mini
reservation: true
- monitoring:
- wattmeter: true
sensors:
power:
available: true
--
GitLab