diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json index 5a9cad0f9237134a6e04b88defc3bf2463fdab1d..6fecb896eb050071063b5ac60018c7901d8b7b15 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.10", "kavlan": false, + "mac": "98:be:94:68:00:10", "mountable": true, "mounted": true, "network_address": "drac-10.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.10", "kavlan": false, + "mac": "70:e2:84:14:00:10", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json index c257310ec57aabb0d03e591ff390f9c95542e328..e60c623eb2434b42f8aab7f463555dd942b361e2 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.11", "kavlan": false, + "mac": "98:be:94:68:00:11", "mountable": true, "mounted": true, "network_address": "drac-11.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.11", "kavlan": false, + "mac": "70:e2:84:14:00:11", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json index 15746cc07a1d40d16036e6e312319ca5a4c138ad..74dac5b082ca541f9f3515739e00fd18e304133d 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.12", "kavlan": false, + "mac": "98:be:94:68:00:12", "mountable": true, "mounted": true, "network_address": "drac-12.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.12", "kavlan": false, + "mac": "70:e2:84:14:00:12", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json index 441274a822183cfdb1ef064c81841efaab36e3f8..9331b05878f45fef4375b5c87e8f1ce9391ad315 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.4", "kavlan": false, + "mac": "98:be:94:68:00:04", "mountable": true, "mounted": true, "network_address": "drac-4.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.4", "kavlan": false, + "mac": "70:e2:84:14:00:04", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json index ee7e6707685e9f09220fce5d73216415f58928b0..fcda7e4b592fea7fcdb8bf71ee8f950f471c7744 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.5", "kavlan": false, + "mac": "98:be:94:68:00:05", "mountable": true, "mounted": true, "network_address": "drac-5.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.5", "kavlan": false, + "mac": "70:e2:84:14:00:05", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json index d03cd7a70134711495e0cd719c22160cd58e2017..874cb58a88029612d7f952bb819585bbffc9db54 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.6", "kavlan": false, + "mac": "98:be:94:68:00:06", "mountable": true, "mounted": true, "network_address": "drac-6.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.6", "kavlan": false, + "mac": "70:e2:84:14:00:06", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json index b35f7fb6b75a92e28b806615ab7c4bbff32e9f81..55b5e020578aee3547a4ac67877d3f76437cad96 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.7", "kavlan": false, + "mac": "98:be:94:68:00:07", "mountable": true, "mounted": true, "network_address": "drac-7.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.7", "kavlan": false, + "mac": "70:e2:84:14:00:07", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json index 3f4c02f4c084778b676073a76cce1492a3b84414..b7df259ac1af6d9d80ab63352ffc62a90dc37eef 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.8", "kavlan": false, + "mac": "98:be:94:68:00:08", "mountable": true, "mounted": true, "network_address": "drac-8.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.8", "kavlan": false, + "mac": "70:e2:84:14:00:08", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json index f5bd3a1dfa9458e08f7cc607e78d0ba01f92e6b6..8c2184297c40274c9bcbf32637d4538dd6f273de 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json @@ -22,7 +22,9 @@ "bridged": true, "device": "eth1", "enabled": true, + "ip": "172.16.24.9", "kavlan": false, + "mac": "98:be:94:68:00:09", "mountable": true, "mounted": true, "network_address": "drac-9.grenoble.grid5000.fr", @@ -70,7 +72,9 @@ "device": "bmc", "enabled": true, "interface": "Ethernet", + "ip": "172.17.24.9", "kavlan": false, + "mac": "70:e2:84:14:00:09", "management": true, "mountable": false, "mounted": false, diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml index 08e089ef124e92959eac1ea6e935fcd1851925ce..bc641d60d99e746e83005ca7c3a586495f08e60d 100644 --- a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml +++ b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml @@ -65,28 +65,3 @@ nodes: interface: SATA storage: HDD model: unknown - - drac-1: - network_adapters: - bmc: - mac: 70:e2:84:14:15:6d - ip: 172.17.24.1 - eth1: - mac: 98:be:94:68:1e:55 - ip: 172.16.24.1 - drac-2: - network_adapters: - bmc: - mac: 70:e2:84:14:11:35 - ip: 172.17.24.2 - eth1: - mac: 98:be:94:68:72:35 - ip: 172.16.24.2 - drac-3: - network_adapters: - bmc: - mac: 70:e2:84:14:15:79 - ip: 172.17.24.3 - eth1: - mac: 98:be:94:68:72:65 - ip: 172.16.24.3 diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac_ip.yaml.erb b/input/grid5000/sites/grenoble/clusters/drac/drac_ip.yaml.erb new file mode 100644 index 0000000000000000000000000000000000000000..5fede371126e443f9a3f2c334bd3ecaf0980b9ff --- /dev/null +++ b/input/grid5000/sites/grenoble/clusters/drac/drac_ip.yaml.erb @@ -0,0 +1,38 @@ +nodes: +<% (1..12).each { |i| %> + drac-<%= i %>: + network_adapters: + eth1: + mounted: true + ip: 172.16.24.<%= i %> + mac: <%= %w( + 98:be:94:68:1e:55 + 98:be:94:68:72:35 + 98:be:94:68:72:65 + 98:be:94:68:00:04 + 98:be:94:68:00:05 + 98:be:94:68:00:06 + 98:be:94:68:00:07 + 98:be:94:68:00:08 + 98:be:94:68:00:09 + 98:be:94:68:00:10 + 98:be:94:68:00:11 + 98:be:94:68:00:12 + )[i-1] %> + bmc: + ip: 172.17.24.<%= i %> + mac: <%= %w( + 70:e2:84:14:15:6d + 70:e2:84:14:11:35 + 70:e2:84:14:15:79 + 70:e2:84:14:00:04 + 70:e2:84:14:00:05 + 70:e2:84:14:00:06 + 70:e2:84:14:00:07 + 70:e2:84:14:00:08 + 70:e2:84:14:00:09 + 70:e2:84:14:00:10 + 70:e2:84:14:00:11 + 70:e2:84:14:00:12 + )[i-1] %> +<% } %>