From 916c35cefc93e87a121ec5ed1b195e31d5db2f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Gaidamour?= <jeremie.gaidamour@inria.fr>
Date: Tue, 15 Mar 2016 18:03:14 +0100
Subject: [PATCH] [rennes] Fixed monitoring for paranoia

---
 .../sites/rennes/clusters/paranoia/nodes/paranoia-1.json       | 3 ---
 .../sites/rennes/clusters/paranoia/nodes/paranoia-2.json       | 3 ---
 .../sites/rennes/clusters/paranoia/nodes/paranoia-3.json       | 3 ---
 .../sites/rennes/clusters/paranoia/nodes/paranoia-4.json       | 3 ---
 .../sites/rennes/clusters/paranoia/nodes/paranoia-5.json       | 3 ---
 .../sites/rennes/clusters/paranoia/nodes/paranoia-6.json       | 3 ---
 .../sites/rennes/clusters/paranoia/nodes/paranoia-7.json       | 3 ---
 .../sites/rennes/clusters/paranoia/nodes/paranoia-8.json       | 3 ---
 generators/input/sites/rennes/clusters/paranoia/paranoia.rb    | 2 +-
 9 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
index 4d4c4d2cacb..2e12fa1d346 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -22,9 +22,6 @@
     "virtual_size": null
   },
   "monitoring": {
-    "wattmeter": "false"
-  },
-  "monitorint": {
     "wattmeter": false
   },
   "network_adapters": [
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
index 5a33c271759..6027d0891ee 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
@@ -22,9 +22,6 @@
     "virtual_size": null
   },
   "monitoring": {
-    "wattmeter": "false"
-  },
-  "monitorint": {
     "wattmeter": false
   },
   "network_adapters": [
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
index 6877c85dbbf..b8b206806f0 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
@@ -22,9 +22,6 @@
     "virtual_size": null
   },
   "monitoring": {
-    "wattmeter": "false"
-  },
-  "monitorint": {
     "wattmeter": false
   },
   "network_adapters": [
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
index 9c5e5ce1f0a..6d9be489c46 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
@@ -22,9 +22,6 @@
     "virtual_size": null
   },
   "monitoring": {
-    "wattmeter": "false"
-  },
-  "monitorint": {
     "wattmeter": false
   },
   "network_adapters": [
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
index 27bf2d3ea6a..452421df458 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
@@ -22,9 +22,6 @@
     "virtual_size": null
   },
   "monitoring": {
-    "wattmeter": "false"
-  },
-  "monitorint": {
     "wattmeter": false
   },
   "network_adapters": [
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
index a6fb9db3c73..7a5633f7967 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
@@ -22,9 +22,6 @@
     "virtual_size": null
   },
   "monitoring": {
-    "wattmeter": "false"
-  },
-  "monitorint": {
     "wattmeter": false
   },
   "network_adapters": [
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
index 49af30fba80..ba83c8d9641 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
@@ -22,9 +22,6 @@
     "virtual_size": null
   },
   "monitoring": {
-    "wattmeter": "false"
-  },
-  "monitorint": {
     "wattmeter": false
   },
   "network_adapters": [
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
index f95b6caf518..b00bcecdc22 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
@@ -22,9 +22,6 @@
     "virtual_size": null
   },
   "monitoring": {
-    "wattmeter": "false"
-  },
-  "monitorint": {
     "wattmeter": false
   },
   "network_adapters": [
diff --git a/generators/input/sites/rennes/clusters/paranoia/paranoia.rb b/generators/input/sites/rennes/clusters/paranoia/paranoia.rb
index 27d91f62a19..c1236cf47f2 100644
--- a/generators/input/sites/rennes/clusters/paranoia/paranoia.rb
+++ b/generators/input/sites/rennes/clusters/paranoia/paranoia.rb
@@ -194,7 +194,7 @@ site :rennes do |site_uid|
           :gpu => false
         })
 
-        monitorint({
+        monitoring({
           :wattmeter => false,
         })
 
-- 
GitLab