[rennes] Fixed monitoring for paranoia

916c35ce · Jérémie Gaidamour · b4de401e · 916c35ce · 916c35ce · 916c35ce
Commit 916c35ce authored Mar 15, 2016 by Jérémie Gaidamour
9 changed files
--- 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": [

--- 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": [

--- 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": [

--- 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": [

--- 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": [

--- 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": [

--- 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": [

--- 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": [

--- 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,
        })