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 ebb2e1d88a7dcdb2bc2bfdac8d69cb4cc89a6d21..da468991b901a43c495af54506f85079c7453828 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 f04f5ede74068d81b7e19a260310e6a83945a7ef..6e274addcffe9ba13898f32c5cf3df2cbd73a63f 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 76f61925a8c5489333cb586ab917d82fa30b6341..625f731534d3f7a3d49727767ce853aea79f9f73 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 a5ecb8e014559aee55a25b2730646053b8c86890..365e34cae8cc7680c93b3cac83387910fb32282b 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 99084de8f4178d34b9fb44975831ec3a8686b4e1..f2481fe713134ebb078e3b1af93d15b2f912891f 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 1177ffbc94f02e09e4e1b96c37b5dab9aca0ca32..2587ef01c5972cdf94fd634bfda31ca5d7dba908 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 10cc9f7bb2bf525135df39e697c9d8652d139bb5..a0532514e862a8484b1027570d21eda167811297 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 907e61dc2a053ead8f999fe19e64cf57f53537ba..a9755e10f2747b8a5e1777a117fb45c07f4d1b0e 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 becb3bad33359fc6b107e4ecec33b50a3370ac9c..d1130f45b4ab4a8b3588c99224615eccdfb8c79c 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 240fb1ec0446864e383e3212b8a58a9054cf3d80..639c2f3199cbb9a84350c1ae26b108ef83b73375 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 b1696ee2c677e762c7c9873e8516ca26be3a9b14..fd7b2bfb5f8ac779c19679c0e51bae04cb22a619 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 a98856681b2d9d046c5118291f0a6a98efa5f19d..94a659c999c844545424b8a483b97570e79a0845 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 29c8ef669ac7df5fd3c32d1c27370df1bcf81eed..4165dd8edd16b69e445415f61aac5b9656ae1eca 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 702638b8d6a6be2bb8a953f10e846a50a765b676..9fee1eb7d7c9afaf979eb744f38e75c6bbece0ee 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 0af191cf385d2de61faebc81e15d17bbd22ad51b..a62b2ef04d114333184db89edd8dfec61e9dca18 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 b3b7f97cce0833c76dc9c06a3cab2851480f6fad..e248197fe0068813cd85b539ebd37324801ad9ad 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 0303c13ff44a7216bf325d6fa2316c85dd69a652..faac96a8571537ac6fae197b10c8caa575148fe3 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 26ab687a76e878d2daa2a792b51ecdbbe0211ce7..d302bc44253c4d0a40c5a1277fda42e726dec4ab 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 061b9991131b9569b14186853ab2b07263ed91cd..3ec261ffda850d77938406c11b4cf180b94ed080 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 e01404e520dd7bfcc810df20e7802b7f3af8f1a6..16d38c5b17d15834d30ae51fdca192b9c19a7b86 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 3048dbdb68e975ff2a9e8828ff6db96fe18ee277..3e149432308e88f9310eb45d849d2a0cb968848a 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 26977589ab2623435ddc3c9e47be22939ee15a04..15d7f04574dae4d52d4a7419127bf63bc3d7d72f 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 3c7753b959b82c639c23ae89ec20f8173e6b85ea..80dbeb0a4abe38d1d72dbaeae36417a82ec2cd38 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'),