Merge branch 'master' into dev

Conflicts:
	generators/input/sites/nancy/clusters/griffon/griffon.rb

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json

@@ -5,9 +5,9 @@
     "smt_size": 12
   },
   "bios": {
-    "release_date": "05/10/2012",
+    "release_date": "01/22/2016",
     "vendor": "Dell Inc.",
-    "version": "1.2.6"
+    "version": 2.5
   },
   "chassis": {
     "manufacturer": "Dell Inc.",

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json

@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,

data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json

@@ -64,15 +64,13 @@
       "bridged": false,
       "device": "eth2",
       "driver": "myri10ge",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "mac": "00:60:dd:46:84:b7",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffon1",
-      "switch_port": "Ten-GigabitEthernet1/1/1",
       "vendor": "myrinet",
       "version": "Myri-10G"
     },

data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json

@@ -64,15 +64,13 @@
       "bridged": false,
       "device": "eth2",
       "driver": "myri10ge",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "mac": "00:60:dd:46:84:b9",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffon1",
-      "switch_port": "Ten-GigabitEthernet1/2/2",
       "vendor": "myrinet",
       "version": "Myri-10G"
     },

data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json

@@ -64,15 +64,13 @@
       "bridged": false,
       "device": "eth2",
       "driver": "myri10ge",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "mac": "00:60:dd:46:84:a8",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "myrinet",
       "version": "Myri-10G"
     },