From 7fe64674b0fc796b5599c13b5ff34d2ae5c7a6f1 Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Wed, 25 Jul 2012 13:03:31 +0200
Subject: [PATCH] Revert "[luxembourg] add addressing plan for kavlan plage
#4421"
This reverts commit d80e8cd6cd7e9276e90d1a8cc483b8c05aebbab1.
---
.../sites/luxembourg/clusters/granduc/nodes/granduc-1.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-10.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-11.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-12.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-13.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-14.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-15.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-16.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-17.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-18.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-19.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-2.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-20.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-21.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-22.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-3.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-4.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-5.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-6.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-7.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-8.json | 4 ----
.../sites/luxembourg/clusters/granduc/nodes/granduc-9.json | 4 ----
generators/input/sites/luxembourg/clusters/granduc.rb | 4 ----
23 files changed, 92 deletions(-)
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
index ebb2e1d88a7..da468991b90 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
index f04f5ede740..6e274addcff 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
index 76f61925a8c..625f731534d 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
index a5ecb8e0145..365e34cae8c 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
index 99084de8f41..f2481fe7131 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
index 1177ffbc94f..2587ef01c59 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
index 10cc9f7bb2b..a0532514e86 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
index 907e61dc2a0..a9755e10f27 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
index becb3bad333..d1130f45b4a 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
index 240fb1ec044..639c2f3199c 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
index b1696ee2c67..fd7b2bfb5f8 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
index a98856681b2..94a659c999c 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
index 29c8ef669ac..4165dd8edd1 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
index 702638b8d6a..9fee1eb7d7c 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
index 0af191cf385..a62b2ef04d1 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
index b3b7f97cce0..e248197fe00 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
index 0303c13ff44..faac96a8571 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
index 26ab687a76e..d302bc44253 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
index 061b9991131..3ec261ffda8 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
index e01404e520d..16d38c5b17d 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
index 3048dbdb68e..3e149432308 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
index 26977589ab2..15d7f04574d 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
@@ -1,8 +1,4 @@
{
- "addressing_plan": {
- "kavlan": "10.40.0.0/14",
- "virt": "10.172.0.0/14"
- },
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
diff --git a/generators/input/sites/luxembourg/clusters/granduc.rb b/generators/input/sites/luxembourg/clusters/granduc.rb
index 3c7753b959b..80dbeb0a4ab 100644
--- a/generators/input/sites/luxembourg/clusters/granduc.rb
+++ b/generators/input/sites/luxembourg/clusters/granduc.rb
@@ -103,10 +103,6 @@ site :luxembourg do |site_uid|
:ip => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'ip'),
:mac => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'mac')
}]
-addressing_plan({
- :kavlan => "10.40.0.0/14",
- :virt => "10.172.0.0/14"
- })
bios({
:version => lookup('granduc', node_uid, 'bios', 'version'),
:vendor => lookup('granduc', node_uid, 'bios', 'vendor'),
--
GitLab