From 216449b92f12694f89ddcf5adc529f7b9e2ddf96 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Tue, 5 Feb 2013 10:28:25 +0100
Subject: [PATCH] [lyon] Change wattmeter property of hercule to "shared"
---
data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json | 2 +-
data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json | 2 +-
data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json | 2 +-
data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json | 2 +-
generators/input/sites/lyon/clusters/hercule.rb | 2 +-
5 files changed, 5 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 219e0794e40..29e6e5a86ce 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
@@ -9,7 +9,7 @@
"virtual_size": null
},
"monitoring": {
- "wattmeter": true
+ "wattmeter": "shared"
},
"network_adapters": [
{
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 4734909a21f..5dc947ae120 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
@@ -9,7 +9,7 @@
"virtual_size": null
},
"monitoring": {
- "wattmeter": true
+ "wattmeter": "shared"
},
"network_adapters": [
{
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 d24d37225a4..dc1ded87139 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
@@ -9,7 +9,7 @@
"virtual_size": null
},
"monitoring": {
- "wattmeter": true
+ "wattmeter": "shared"
},
"network_adapters": [
{
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 3f9c13842c4..b87d9f03603 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
@@ -9,7 +9,7 @@
"virtual_size": null
},
"monitoring": {
- "wattmeter": true
+ "wattmeter": "shared"
},
"network_adapters": [
{
diff --git a/generators/input/sites/lyon/clusters/hercule.rb b/generators/input/sites/lyon/clusters/hercule.rb
index 74fa9a1e2d6..bcbb7971da5 100644
--- a/generators/input/sites/lyon/clusters/hercule.rb
+++ b/generators/input/sites/lyon/clusters/hercule.rb
@@ -109,7 +109,7 @@ site :lyon do |site_uid|
:mac => lookup('hercule',"#{node_uid}",'network_interfaces','eth3','mac'),
}]
monitoring({
- :wattmeter => true
+ :wattmeter => 'shared',
})
end
end
--
GitLab