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 c0e29c1129abbb9d010365e880be02d2a08d1bf0..abf395d32a69fe1ef13cfee773f89662f4cc10d3 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 f6e04edf3166ed8b7d4c47079b490af5d425212b..bf5cf1b3285e0c959c36824233f8b5969d1a4533 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 96f10d29bf9a417ca426c9cc8dbc1fa4b3dfad21..0ea3e17ffb90b26c7df56105f7ea7728eedabfda 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 b0150a4e7e9820e04450847c66f9ece4825c31d4..4ad2c766145935d5b53d30d74da9271014bd7169 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 4bb5a1ce797209808e0b307cdd960a523b614ae9..966c902170ed3adba5b60b20b88f47a9a5e142d8 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 cfd26003c86e4aa0ead8d0fa1b39f6d18c8bb57e..3a4c60dec6dde7574b223bab622ef71fdf8c79d4 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 4f074519d5812ddcd5be1dc278c05e72ab8b96cc..57451953e391e35c0aaf30968fc6107159420e9f 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 6205d6ed03dd0b65d69dc8bc330bbc318b9cb660..b6dba2b96edd6194e417b3c0a104938391baf3ae 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 9988356e5a7e42be70af4c04ff72a3479e27f311..d72f1d69a01b80cd1a59968a6145edcaa983a4a4 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 464288353f01ff110f8f18a6b1fe0ead01899d09..442c5b66ccb58fa69ac1a27a14b33d8b22677dbb 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 e99e3f1652ad1ececf29282e689f1eb73b2cb9a4..58ad9590e94244690b05fbb5e7c4257e86a56776 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 daed31421c9a6795812ea42e7fa63193dd798eb2..842bed5cc480fdf3a6a51a6f3601137227ee0dcd 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 67c4c84f9e45fb80116eaeb10cc9bbd190485f57..6f6345ecd7706adab5e76c1f0c35add3484e42ca 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 c6b620c8c52cee2b1871293fb922cbf9cfb814e0..72cb4d66d4a171a47b79a8f57599d5c18e29a594 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 142d62a0261da88d6e670730b9986c2405a04bdf..40beb9e2a803fe599518712ce8b24cde368931c9 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 4445e1d42f08e2f61c452fb39847797042f20d0f..e6b596cfc06684db0c9c1511de7f1f832f602cc8 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 22b21b5c311b60b3543ffa146a457533a4ba8ecb..35aabe07f47398731a7fa192592551620d888a5c 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 bba825a23fd22a922d6ddd2094b02ce6952a810f..c24c8ca6c1d64ac33931791e0c969fbc32ab5746 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 38cce478c5167e1b209fabdf6d65e10a220f049f..07379cdda9ccd32a90471c236789265540f120c5 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 f691d7c57da4b6edb3da60bca2335cd1b3b3cb38..c627b6125fd01eaea2b293972c1ac55c3367eb8f 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 5f8c3d3179fadd036640683bba292f7744191863..d1eaebf9904a246030f3ae4f862b5e4ac77d4067 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 21d6bd27ce5f7c541bcf016429c71aafa04a7a09..2d4e051798820df92255344edf2d7589ad76fc5c 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