diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
index efcdb28abdf51656786f0bfcb9a8406167652be9..c452d7fd006372767d55e05455077045c91c78bc 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
@@ -10,7 +10,7 @@
"version": "1.66.00"
},
"gpu": {
- "gpu": true,
+ "gpu": false,
"gpu_count": 4,
"gpu_model": "Tesla-S2050"
},
@@ -23,33 +23,33 @@
},
"network_adapters": [
{
- "bridged": true,
"device": "eth0",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.16.35.1",
+ "ip": "172.17.35.1",
"mac": "00:26:6c:f9:18:e4",
"management": false,
"mountable": true,
- "mounted": true,
- "network_address": "chirloute-1.lille.grid5000.fr",
+ "mounted": false,
+ "network_address": "chirloute-1-eth0.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"vendor": "Intel",
"version": "82576EB"
},
{
+ "bridged": true,
"device": "eth1",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.17.35.1",
+ "ip": "172.16.35.1",
"mac": "00:26:6c:f9:18:e5",
"management": false,
"mountable": true,
- "mounted": false,
- "network_address": "chirloute-1-eth0.lille.grid5000.fr",
+ "mounted": true,
+ "network_address": "chirloute-1.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"switch_port": "Gi4/25",
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
index 369aada877892af95a16b6284a952c1375147212..60d4fe6e002be1bb6411f7f4c2966baa74df9e9d 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
@@ -10,7 +10,7 @@
"version": "1.66.00"
},
"gpu": {
- "gpu": true,
+ "gpu": false,
"gpu_count": 4,
"gpu_model": "Tesla-S2050"
},
@@ -23,33 +23,33 @@
},
"network_adapters": [
{
- "bridged": true,
"device": "eth0",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.16.35.2",
+ "ip": "172.17.35.2",
"mac": "00:26:6c:f9:17:e8",
"management": false,
"mountable": true,
- "mounted": true,
- "network_address": "chirloute-2.lille.grid5000.fr",
+ "mounted": false,
+ "network_address": "chirloute-2-eth0.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"vendor": "Intel",
"version": "82576EB"
},
{
+ "bridged": true,
"device": "eth1",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.17.35.2",
+ "ip": "172.16.35.2",
"mac": "00:26:6c:f9:17:e9",
"management": false,
"mountable": true,
- "mounted": false,
- "network_address": "chirloute-2-eth0.lille.grid5000.fr",
+ "mounted": true,
+ "network_address": "chirloute-2.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"switch_port": "Gi3/25",
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
index ee61b33a376f78aaa01843f11a3bc17359f12cfc..bd191df29590ea6aa0e7547a6026cb3eae5fc802 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
@@ -10,7 +10,7 @@
"version": "1.66.00"
},
"gpu": {
- "gpu": true,
+ "gpu": false,
"gpu_count": 4,
"gpu_model": "Tesla-S2050"
},
@@ -23,33 +23,33 @@
},
"network_adapters": [
{
- "bridged": true,
"device": "eth0",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.16.35.3",
+ "ip": "172.17.35.3",
"mac": "00:26:6c:f9:15:70",
"management": false,
"mountable": true,
- "mounted": true,
- "network_address": "chirloute-3.lille.grid5000.fr",
+ "mounted": false,
+ "network_address": "chirloute-3-eth0.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"vendor": "Intel",
"version": "82576EB"
},
{
+ "bridged": true,
"device": "eth1",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.17.35.3",
+ "ip": "172.16.35.3",
"mac": "00:26:6c:f9:15:71",
"management": false,
"mountable": true,
- "mounted": false,
- "network_address": "chirloute-3-eth0.lille.grid5000.fr",
+ "mounted": true,
+ "network_address": "chirloute-3.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"switch_port": "Gi3/30",
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
index eb85395daa7dcae8c85b9560d260a744094980a5..6add01642e54c597d849dba4c1b4e094d4cf50f7 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
@@ -10,7 +10,7 @@
"version": "1.66.00"
},
"gpu": {
- "gpu": true,
+ "gpu": false,
"gpu_count": 4,
"gpu_model": "Tesla-S2050"
},
@@ -23,33 +23,33 @@
},
"network_adapters": [
{
- "bridged": true,
"device": "eth0",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.16.35.4",
+ "ip": "172.17.35.4",
"mac": "00:26:6c:f9:19:60",
"management": false,
"mountable": true,
- "mounted": true,
- "network_address": "chirloute-4.lille.grid5000.fr",
+ "mounted": false,
+ "network_address": "chirloute-4-eth0.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"vendor": "Intel",
"version": "82576EB"
},
{
+ "bridged": true,
"device": "eth1",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.17.35.4",
+ "ip": "172.16.35.4",
"mac": "00:26:6c:f9:19:61",
"management": false,
"mountable": true,
- "mounted": false,
- "network_address": "chirloute-4-eth0.lille.grid5000.fr",
+ "mounted": true,
+ "network_address": "chirloute-4.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"switch_port": "Gi3/26",
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
index 8b03acc7627bae4d6cd36bc2058cc868701b0b47..0ee70f38426f645ce4b8a546b66aab0f62c3c709 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
@@ -10,7 +10,7 @@
"version": "1.66.00"
},
"gpu": {
- "gpu": true,
+ "gpu": false,
"gpu_count": 4,
"gpu_model": "Tesla-S2050"
},
@@ -23,33 +23,33 @@
},
"network_adapters": [
{
- "bridged": true,
"device": "eth0",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.16.35.5",
+ "ip": "172.17.35.5",
"mac": "00:26:6c:f9:16:08",
"management": false,
"mountable": true,
- "mounted": true,
- "network_address": "chirloute-5.lille.grid5000.fr",
+ "mounted": false,
+ "network_address": "chirloute-5-eth0.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"vendor": "Intel",
"version": "82576EB"
},
{
+ "bridged": true,
"device": "eth1",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.17.35.5",
+ "ip": "172.16.35.5",
"mac": "00:26:6c:f9:16:09",
"management": false,
"mountable": true,
- "mounted": false,
- "network_address": "chirloute-5-eth0.lille.grid5000.fr",
+ "mounted": true,
+ "network_address": "chirloute-5.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"switch_port": "Gi4/23",
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
index 69e31f0a3940fa07b289708593f440983246115a..d841872ff971d7b96c4a5e5c266d5e7c28d92d65 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
@@ -10,7 +10,7 @@
"version": "1.66.00"
},
"gpu": {
- "gpu": true,
+ "gpu": false,
"gpu_count": 4,
"gpu_model": "Tesla-S2050"
},
@@ -23,33 +23,33 @@
},
"network_adapters": [
{
- "bridged": true,
"device": "eth0",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.16.35.6",
+ "ip": "172.17.35.6",
"mac": "00:26:6c:f9:17:20",
"management": false,
"mountable": true,
- "mounted": true,
- "network_address": "chirloute-6.lille.grid5000.fr",
+ "mounted": false,
+ "network_address": "chirloute-6-eth0.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"vendor": "Intel",
"version": "82576EB"
},
{
+ "bridged": true,
"device": "eth1",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.17.35.6",
+ "ip": "172.16.35.6",
"mac": "00:26:6c:f9:17:21",
"management": false,
"mountable": true,
- "mounted": false,
- "network_address": "chirloute-6-eth0.lille.grid5000.fr",
+ "mounted": true,
+ "network_address": "chirloute-6.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"switch_port": "Gi3/31",
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
index 0234e99eee95c0126691e47718f002cee6a111cf..877ea88a960b07dce2258024362fc5f16bd75ca7 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
@@ -10,7 +10,7 @@
"version": "1.66.00"
},
"gpu": {
- "gpu": true,
+ "gpu": false,
"gpu_count": 4,
"gpu_model": "Tesla-S2050"
},
@@ -23,33 +23,33 @@
},
"network_adapters": [
{
- "bridged": true,
"device": "eth0",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.16.35.7",
+ "ip": "172.17.35.7",
"mac": "00:26:6c:f9:17:b8",
"management": false,
"mountable": true,
- "mounted": true,
- "network_address": "chirloute-7.lille.grid5000.fr",
+ "mounted": false,
+ "network_address": "chirloute-7-eth0.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"vendor": "Intel",
"version": "82576EB"
},
{
+ "bridged": true,
"device": "eth1",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.17.35.7",
+ "ip": "172.16.35.7",
"mac": "00:26:6c:f9:17:b9",
"management": false,
"mountable": true,
- "mounted": false,
- "network_address": "chirloute-7-eth0.lille.grid5000.fr",
+ "mounted": true,
+ "network_address": "chirloute-7.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"switch_port": "Gi4/48",
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
index b29ccf029c9b28a76a3b9a77cbd5d9b59fb727b8..46dc8fe721edf4a69fd26d5efc4cd47a9f1300e5 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
@@ -10,7 +10,7 @@
"version": "1.66.00"
},
"gpu": {
- "gpu": true,
+ "gpu": false,
"gpu_count": 4,
"gpu_model": "Tesla-S2050"
},
@@ -23,33 +23,33 @@
},
"network_adapters": [
{
- "bridged": true,
"device": "eth0",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.16.35.8",
+ "ip": "172.17.35.8",
"mac": "00:26:6c:f9:19:80",
"management": false,
"mountable": true,
- "mounted": true,
- "network_address": "chirloute-8.lille.grid5000.fr",
+ "mounted": false,
+ "network_address": "chirloute-8-eth0.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"vendor": "Intel",
"version": "82576EB"
},
{
+ "bridged": true,
"device": "eth1",
"driver": "igb",
"enabled": true,
"interface": "Ethernet",
- "ip": "172.17.35.8",
+ "ip": "172.16.35.8",
"mac": "00:26:6c:f9:19:81",
"management": false,
"mountable": true,
- "mounted": false,
- "network_address": "chirloute-8-eth0.lille.grid5000.fr",
+ "mounted": true,
+ "network_address": "chirloute-8.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw-lille",
"switch_port": "Gi3/32",
diff --git a/generators/input/sites/lille/clusters/chirloute.rb b/generators/input/sites/lille/clusters/chirloute.rb
index 46d8fcef5b9456ea0053d358634fda625ce8e32a..500c067d1628a0103440e39da43835d15292e24f 100644
--- a/generators/input/sites/lille/clusters/chirloute.rb
+++ b/generators/input/sites/lille/clusters/chirloute.rb
@@ -50,10 +50,9 @@ site :lille do |site_uid|
:management => false,
:mountable => true,
:driver => 'igb',
- :mounted => true,
- :bridged => true,
+ :mounted => false,
:device => 'eth0',
- :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+ :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
:ip => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'ip'),
:switch => 'gw-lille'
},{
@@ -66,9 +65,10 @@ site :lille do |site_uid|
:management => false,
:mountable => true,
:driver => 'igb',
- :mounted => false,
+ :mounted => true,
+ :bridged => true,
:device => 'eth1',
- :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
+ :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:ip => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'ip'),
:switch => 'gw-lille',
:switch_port => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'switch_port')
@@ -92,7 +92,7 @@ site :lille do |site_uid|
})
gpu({
- :gpu => true,
+ :gpu => false,
:gpu_count => lookup('chirloute', node_uid, 'gpu', 'gpu_count'),
:gpu_model => lookup('chirloute', node_uid, 'gpu', 'gpu_model'),
})
diff --git a/generators/input/sites/lille/clusters/chirloute.yaml b/generators/input/sites/lille/clusters/chirloute.yaml
index 7e41089bc56fb04430949d851f04a55877f901ea..1d88b996027b70baced69242bcab5b962cd586dc 100644
--- a/generators/input/sites/lille/clusters/chirloute.yaml
+++ b/generators/input/sites/lille/clusters/chirloute.yaml
@@ -9,10 +9,10 @@ chirloute-1:
ip: 172.17.35.101
eth0:
mac: 00:26:6c:f9:18:e4
- ip: 172.16.35.1
+ ip: 172.17.35.1
eth1:
mac: 00:26:6c:f9:18:e5
- ip: 172.17.35.1
+ ip: 172.16.35.1
switch_port: Gi4/25
chassis:
serial_number: D385Z4J
@@ -38,10 +38,10 @@ chirloute-2:
ip: 172.17.35.102
eth0:
mac: 00:26:6c:f9:17:e8
- ip: 172.16.35.2
+ ip: 172.17.35.2
eth1:
mac: 00:26:6c:f9:17:e9
- ip: 172.17.35.2
+ ip: 172.16.35.2
switch_port: Gi3/25
chassis:
serial_number: D385Z4J
@@ -67,10 +67,10 @@ chirloute-3:
ip: 172.17.35.103
eth0:
mac: 00:26:6c:f9:15:70
- ip: 172.16.35.3
+ ip: 172.17.35.3
eth1:
mac: 00:26:6c:f9:15:71
- ip: 172.17.35.3
+ ip: 172.16.35.3
switch_port: Gi3/30
chassis:
serial_number: D385Z4J
@@ -96,10 +96,10 @@ chirloute-4:
ip: 172.17.35.104
eth0:
mac: 00:26:6c:f9:19:60
- ip: 172.16.35.4
+ ip: 172.17.35.4
eth1:
mac: 00:26:6c:f9:19:61
- ip: 172.17.35.4
+ ip: 172.16.35.4
switch_port: Gi3/26
chassis:
serial_number: D385Z4J
@@ -125,10 +125,10 @@ chirloute-5:
ip: 172.17.35.105
eth0:
mac: 00:26:6c:f9:16:08
- ip: 172.16.35.5
+ ip: 172.17.35.5
eth1:
mac: 00:26:6c:f9:16:09
- ip: 172.17.35.5
+ ip: 172.16.35.5
switch_port: Gi4/23
chassis:
serial_number: F385Z4J
@@ -154,10 +154,10 @@ chirloute-6:
ip: 172.17.35.106
eth0:
mac: 00:26:6c:f9:17:20
- ip: 172.16.35.6
+ ip: 172.17.35.6
eth1:
mac: 00:26:6c:f9:17:21
- ip: 172.17.35.6
+ ip: 172.16.35.6
switch_port: Gi3/31
chassis:
serial_number: F385Z4J
@@ -183,10 +183,10 @@ chirloute-7:
ip: 172.17.35.107
eth0:
mac: 00:26:6c:f9:17:b8
- ip: 172.16.35.7
+ ip: 172.17.35.7
eth1:
mac: 00:26:6c:f9:17:b9
- ip: 172.17.35.7
+ ip: 172.16.35.7
switch_port: Gi4/48
chassis:
serial_number: F385Z4J
@@ -212,10 +212,10 @@ chirloute-8:
ip: 172.17.35.108
eth0:
mac: 00:26:6c:f9:19:80
- ip: 172.16.35.8
+ ip: 172.17.35.8
eth1:
mac: 00:26:6c:f9:19:81
- ip: 172.17.35.8
+ ip: 172.16.35.8
switch_port: Gi3/32
chassis:
serial_number: F385Z4J