[Grenoble] remove adonis-11 et adonis-12 from repo

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json

@@ -60,6 +60,19 @@
       "vendor": "Intel",
       "version": "Device 10c9 (rev 01)"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s  (rev a0)"
+    },
     {
       "enabled": true,
       "interface": "Ethernet",
@@ -71,7 +84,7 @@
       "network_address": "adonis-10-bmc.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Super Micro Computer Inc.",
-      "version": "1.15"
+      "version": "1.33"
     }
   ],
   "operating_system": {
@@ -85,12 +98,12 @@
     "cache_l1d": null,
     "cache_l1i": null,
     "cache_l2": null,
-    "clock_speed": 2260000000.0,
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
     "model": "Intel Xeon",
     "other_description": "",
     "vendor": "Intel",
-    "version": "E5520"
+    "version": "E5620"
   },
   "storage_devices": [
     {

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json

@@ -60,6 +60,19 @@
       "vendor": "Intel",
       "version": "Device 10c9 (rev 01)"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s  (rev a0)"
+    },
     {
       "enabled": true,
       "interface": "Ethernet",
@@ -71,7 +84,7 @@
       "network_address": "adonis-9-bmc.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Super Micro Computer Inc.",
-      "version": "1.15"
+      "version": "1.33"
     }
   ],
   "operating_system": {
@@ -85,12 +98,12 @@
     "cache_l1d": null,
     "cache_l1i": null,
     "cache_l2": null,
-    "clock_speed": 2260000000.0,
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
     "model": "Intel Xeon",
     "other_description": "",
     "vendor": "Intel",
-    "version": "E5520"
+    "version": "E5620"
   },
   "storage_devices": [
     {

generators/input/grenoble-adonis.rb

@@ -107,7 +107,7 @@ site :grenoble do |site_uid|
     end
     2.times do |i|
       model "Bull R425-E2 4U + Tesla C2050"
-      node "#{cluster_uid}-#{i+11}" do |node_uid|
+      node "#{cluster_uid}-#{i+9}" do |node_uid|
         supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
         architecture({
           :smp_size => 2,

generators/input/grenoble-adonis.yaml

@@ -258,59 +258,3 @@ adonis-10:
       ip: 172.16.16.140
     eth1:
       mac: 00:30:48:cc:83:11
-adonis-11:
-  bios:
-    version: 1.1
-    release_date: (03/12/2010)
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: WD2502ABYS-0
-      size: 251.GB
-      vendor: Western Digital
-  chassis:
-    serial_number: XAN-SMB-00045
-    manufacturer: Bull SAS
-    product_name: bullx R425E2
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:bf:e3
-      ip: 172.16.18.141
-    bmc:
-      mac: 00:30:48:da:77:38
-      ip: 192.168.2.141
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:bf:e4
-    eth0:
-      mac: 00:30:48:da:6f:66
-      ip: 172.16.16.141
-    eth1:
-      mac: 00:30:48:da:6f:67
-adonis-12:
-  bios:
-    version: 1.1
-    release_date: (03/12/2010)
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: WD2502ABYS-0
-      size: 251.GB
-      vendor: Western Digital
-  chassis:
-    serial_number: 1234567890
-    manufacturer: Supermicro
-    product_name: X8DAH
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:0d
-      ip: 172.16.18.142
-    bmc:
-      mac: 00:25:90:01:e7:fb
-      ip: 192.168.2.142
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:0e
-    eth0:
-      mac: 00:25:90:01:eb:fc
-      ip: 172.16.16.142
-    eth1:
-      mac: 00:25:90:01:eb:fd