From 53166d65662e014f67a721d7ef1eb4e5a2b23f69 Mon Sep 17 00:00:00 2001
From: Nicolas Michon <nicolas.michon@inria.fr>
Date: Thu, 21 Sep 2017 15:17:11 +0200
Subject: [PATCH] [luxembourg] Removed secondary interfaces ip address for
 granduc

---
 .../sites/luxembourg/clusters/granduc/nodes/granduc-1.json      | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-10.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-12.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-13.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-14.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-15.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-16.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-17.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-18.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-19.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-2.json      | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-20.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-21.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-22.json     | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-3.json      | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-4.json      | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-5.json      | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-6.json      | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-7.json      | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-8.json      | 2 --
 .../sites/luxembourg/clusters/granduc/nodes/granduc-9.json      | 2 --
 .../sites/luxembourg/clusters/granduc/granduc_ip.yaml.erb       | 2 --
 22 files changed, 44 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 c0e29c1129a..abf395d32a6 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.1",
       "kavlan": true,
       "mac": "00:19:b9:f0:01:ca",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.1",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:4b",
       "management": false,
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 f6e04edf316..bf5cf1b3285 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
@@ -95,7 +95,6 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.178.10",
       "kavlan": true,
       "mac": "00:22:19:6d:85:0c",
       "management": false,
@@ -112,7 +111,6 @@
       "driver": "ixgbe",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.179.10",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:3d",
       "management": false,
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 96f10d29bf9..0ea3e17ffb9 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.12",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:12",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.12",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:1c",
       "management": false,
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 b0150a4e7e9..4ad2c766145 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.13",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:58",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.13",
       "kavlan": false,
       "mac": "00:1b:21:3d:13:af",
       "management": false,
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 4bb5a1ce797..966c902170e 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.14",
       "kavlan": true,
       "mac": "00:19:b9:f2:03:bd",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.14",
       "kavlan": false,
       "mac": "00:1b:21:3d:11:f7",
       "management": false,
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 cfd26003c86..3a4c60dec6d 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.15",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:30",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.15",
       "kavlan": false,
       "mac": "00:1b:21:34:e0:f1",
       "management": false,
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 4f074519d58..57451953e39 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.16",
       "kavlan": true,
       "mac": "00:19:b9:f2:0f:4d",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.16",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:1a",
       "management": false,
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 6205d6ed03d..b6dba2b96ed 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.17",
       "kavlan": true,
       "mac": "00:19:b9:de:b9:1e",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.17",
       "kavlan": false,
       "mac": "00:1b:21:3c:87:71",
       "management": false,
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 9988356e5a7..d72f1d69a01 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.18",
       "kavlan": true,
       "mac": "00:19:b9:f3:ba:b2",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.18",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:07",
       "management": false,
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 464288353f0..442c5b66ccb 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
@@ -95,7 +95,6 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.178.19",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:df",
       "management": false,
@@ -112,7 +111,6 @@
       "driver": "ixgbe",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.179.19",
       "kavlan": false,
       "mac": "00:1b:21:3d:13:9b",
       "management": false,
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 e99e3f1652a..58ad9590e94 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.2",
       "kavlan": true,
       "mac": "00:19:b9:f0:01:d9",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.2",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:35",
       "management": false,
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 daed31421c9..842bed5cc48 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.20",
       "kavlan": true,
       "mac": "00:19:b9:f2:08:cc",
       "management": false,
@@ -118,7 +117,6 @@
       "bridged": false,
       "device": "eth2",
       "enabled": true,
-      "ip": "172.16.179.20",
       "kavlan": false,
       "mac": "00:1b:21:3d:13:27",
       "mountable": true,
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 67c4c84f9e4..6f6345ecd77 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.21",
       "kavlan": true,
       "mac": "00:19:b9:f3:c2:7f",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.21",
       "kavlan": false,
       "mac": "00:1b:21:3d:13:7d",
       "management": false,
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 c6b620c8c52..72cb4d66d4a 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.22",
       "kavlan": true,
       "mac": "00:19:b9:f3:ba:a8",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.22",
       "kavlan": false,
       "mac": "00:1b:21:34:e0:e7",
       "management": false,
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 142d62a0261..40beb9e2a80 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.3",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:85",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.3",
       "kavlan": false,
       "mac": "00:1b:21:3c:87:cb",
       "management": false,
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 4445e1d42f0..e6b596cfc06 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.4",
       "kavlan": true,
       "mac": "00:19:b9:f2:0a:e8",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.4",
       "kavlan": false,
       "mac": "00:1b:21:3d:12:e9",
       "management": false,
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 22b21b5c311..35aabe07f47 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.5",
       "kavlan": true,
       "mac": "00:19:b9:f1:f8:0b",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.5",
       "kavlan": false,
       "mac": "00:1b:21:3d:12:d1",
       "management": false,
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 bba825a23fd..c24c8ca6c1d 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.6",
       "kavlan": true,
       "mac": "00:19:b9:f2:0c:82",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.6",
       "kavlan": false,
       "mac": "00:1b:21:3d:13:ab",
       "management": false,
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 38cce478c51..07379cdda9c 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
@@ -95,7 +95,6 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.178.7",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:71",
       "management": false,
@@ -112,7 +111,6 @@
       "driver": "ixgbe",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.179.7",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:5f",
       "management": false,
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 f691d7c57da..c627b6125fd 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.8",
       "kavlan": true,
       "mac": "00:19:b9:ee:11:4c",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.8",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:8d",
       "management": false,
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 5f8c3d3179f..d1eaebf9904 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
@@ -100,7 +100,6 @@
       "enabled": true,
       "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
-      "ip": "172.16.178.9",
       "kavlan": true,
       "mac": "00:19:b9:f1:fc:4b",
       "management": false,
@@ -121,7 +120,6 @@
       "enabled": true,
       "firmware_version": "0xc7390000",
       "interface": "Ethernet",
-      "ip": "172.16.179.9",
       "kavlan": false,
       "mac": "00:1b:21:3d:14:31",
       "management": false,
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_ip.yaml.erb b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_ip.yaml.erb
index 21d6bd27ce5..2d4e0517988 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_ip.yaml.erb
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_ip.yaml.erb
@@ -31,7 +31,6 @@ nodes:
                    )[i-1] %>
       eth1:
         mounted: false
-        ip: 172.16.178.<%= i %>
         mac: <%= %w(
                     00:19:b9:f0:01:ca
                     00:19:b9:f0:01:d9
@@ -58,7 +57,6 @@ nodes:
                    )[i-1] %>
       eth2:
         mounted: false
-        ip: 172.16.179.<%= i %>
         mac: <%= %w(
                     00:1b:21:34:e1:4b
                     00:1b:21:34:e1:35
-- 
GitLab