[grenoble] edel and adonis merge into master from testing

Conflicts:

data/grid5000/sites/grenoble/clusters/adonis/adonis.json

+{
+  "created_at": "Wed, 01 Sep 2010 22:00:00 GMT",
+  "model": "Bull R425-E2 4U + Tesla C2050",
+  "type": "cluster",
+  "uid": "adonis"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.131",
+      "network_address": "adonis-1-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.131",
+      "network_address": "adonis-1.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2260000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-1"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.140",
+      "network_address": "adonis-10-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.140",
+      "network_address": "adonis-10.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2260000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-10"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.141",
+      "network_address": "adonis-11-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.141",
+      "network_address": "adonis-11.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-11"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.142",
+      "network_address": "adonis-12-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.142",
+      "network_address": "adonis-12.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-12"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.132",
+      "network_address": "adonis-2-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.132",
+      "network_address": "adonis-2.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2260000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-2"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.133",
+      "network_address": "adonis-3-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.133",
+      "network_address": "adonis-3.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2260000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-3"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.134",
+      "network_address": "adonis-4-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.134",
+      "network_address": "adonis-4.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2260000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-4"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.135",
+      "network_address": "adonis-5-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.135",
+      "network_address": "adonis-5.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2260000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-5"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "InfiniBand QDR",
+      "ip": "172.16.18.136",
+      "network_address": "adonis-6-ib.grenoble.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.18.136",
+      "network_address": "adonis-6.grenoble.grid5000.fr",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2260000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-6"
+}
\ No newline at end of file

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

+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {