From 7d2d59e60c574242b66becc8e3379c004a429004 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Tue, 7 Aug 2012 08:55:29 +0200
Subject: [PATCH] [sophia] activating cacti rrd only for fastiron for now
---
data/grid5000/sites/sophia/network_equipments/ciscosol.json | 2 +-
data/grid5000/sites/sophia/network_equipments/edgeiron.json | 6 +++---
generators/input/sites/sophia/net-links/ciscosol.yaml | 2 ++
generators/input/sites/sophia/net-links/edgeiron.yaml | 6 ++++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/data/grid5000/sites/sophia/network_equipments/ciscosol.json b/data/grid5000/sites/sophia/network_equipments/ciscosol.json
index d544abceeb7..62544167cfb 100644
--- a/data/grid5000/sites/sophia/network_equipments/ciscosol.json
+++ b/data/grid5000/sites/sophia/network_equipments/ciscosol.json
@@ -256,6 +256,6 @@
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
-
+ "use_cacti": "no"
}
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/edgeiron.json b/data/grid5000/sites/sophia/network_equipments/edgeiron.json
index fd5c3b57b7d..cb05b213411 100644
--- a/data/grid5000/sites/sophia/network_equipments/edgeiron.json
+++ b/data/grid5000/sites/sophia/network_equipments/edgeiron.json
@@ -12,11 +12,11 @@
},
{
- "port": "2/1",
+ "port": "ethernet2/1",
"uid": "fastiron"
},
{
- "port": "2/2",
+ "port": "ethernet2/2",
"uid": "fastiron"
}
],
@@ -295,6 +295,6 @@
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
-
+ "use_cacti": "no"
}
}
\ No newline at end of file
diff --git a/generators/input/sites/sophia/net-links/ciscosol.yaml b/generators/input/sites/sophia/net-links/ciscosol.yaml
index 0a59fbc0dbe..19e7faa62bb 100644
--- a/generators/input/sites/sophia/net-links/ciscosol.yaml
+++ b/generators/input/sites/sophia/net-links/ciscosol.yaml
@@ -4,6 +4,8 @@ ciscosol:
kind: switch
site: sophia
snmp_community: public
+ weathermap:
+ use_cacti: "no"
vlans:
naming_pattern: Vlan%VLANID%
routes: {}
diff --git a/generators/input/sites/sophia/net-links/edgeiron.yaml b/generators/input/sites/sophia/net-links/edgeiron.yaml
index 3bf886e467c..6a70f592468 100644
--- a/generators/input/sites/sophia/net-links/edgeiron.yaml
+++ b/generators/input/sites/sophia/net-links/edgeiron.yaml
@@ -4,6 +4,8 @@ edgeiron:
kind: router
site: sophia
snmp_community: public
+ weathermap:
+ use_cacti: "no"
vlans:
naming_pattern: Vlan%VLANID%
"100":
@@ -20,10 +22,10 @@ edgeiron:
ports:
1:
uid: fastiron
- port: 2/1
+ port: ethernet2/1
2:
uid: fastiron
- port: 2/2
+ port: ethernet2/2
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
--
GitLab