Commit 63e879c6 authored by Jérémie Gaidamour's avatar Jérémie Gaidamour
Browse files

Merge branch 'master' into dev

Conflicts:
	generators/input/sites/nancy/clusters/griffon/griffon.rb
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-30.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-31.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-32.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-33.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-34.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-35.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-36.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-37.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-38.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-39.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-40.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-41.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-42.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-43.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-44.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-45.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-46.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-47.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-48.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-49.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-50.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-51.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-52.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-53.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-54.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-55.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-56.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-57.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-61.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-62.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-63.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-64.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-65.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-66.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-67.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-68.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-69.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-70.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-71.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-72.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-73.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-74.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-75.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-76.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-77.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-78.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-79.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-80.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-81.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-82.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-83.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-84.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-85.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-86.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-87.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-88.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-89.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-90.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-91.yaml
	generators/input/sites/nancy/clusters/griffon/nodes/griffon-92.yaml
parents bc545987 4133ca57
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:18f1",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-1-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:7f59",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-10-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -87,8 +87,7 @@
"ip6": "fe80::202:c903:2:80d9",
"management": false,
"mountable": false,
"mounted": true,
"network_address": "griffon-11-ib0.nancy.grid5000.fr",
"mounted": false,
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -87,8 +87,7 @@
"ip6": "fe80::202:c903:2:80dd",
"management": false,
"mountable": false,
"mounted": true,
"network_address": "griffon-12-ib0.nancy.grid5000.fr",
"mounted": false,
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -87,8 +87,7 @@
"ip6": "fe80::202:c903:2:80bd",
"management": false,
"mountable": false,
"mounted": true,
"network_address": "griffon-13-ib0.nancy.grid5000.fr",
"mounted": false,
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -87,8 +87,7 @@
"ip6": "fe80::202:c903:2:80cd",
"management": false,
"mountable": false,
"mounted": true,
"network_address": "griffon-14-ib0.nancy.grid5000.fr",
"mounted": false,
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:80b5",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-15-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:303f",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-16-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:3017",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-17-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:302b",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-18-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:3037",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-19-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:8065",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-2-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:2fcb",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-20-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:304f",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-21-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:3033",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-22-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:302f",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-23-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:2fd7",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-24-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:3023",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-25-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:2fd3",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-26-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:301f",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-27-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:2fdb",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-28-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:3043",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-29-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:7f61",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-3-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:8069",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-4-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:80c1",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-5-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:179d",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-58-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:1731",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-59-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:80ad",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-6-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:3:1741",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-60-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:8055",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-7-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:80c9",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-8-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -73,7 +73,7 @@
"ip6": "fe80::202:c903:2:805d",
"management": false,
"mountable": false,
"mounted": true,
"mounted": false,
"network_address": "griffon-9-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
......
......@@ -33,7 +33,7 @@ griffon-1:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -51,7 +51,7 @@ griffon-10:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -56,7 +56,7 @@ griffon-11:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -67,7 +67,7 @@ griffon-12:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -43,7 +43,7 @@ griffon-13:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -52,7 +52,7 @@ griffon-14:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -51,7 +51,7 @@ griffon-15:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -46,7 +46,7 @@ griffon-16:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -33,7 +33,7 @@ griffon-17:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -36,7 +36,7 @@ griffon-18:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -37,7 +37,7 @@ griffon-19:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -64,7 +64,7 @@ griffon-2:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -54,7 +54,7 @@ griffon-20:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -52,7 +52,7 @@ griffon-21:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -39,7 +39,7 @@ griffon-22:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -40,7 +40,7 @@ griffon-23:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -55,7 +55,7 @@ griffon-24:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -33,7 +33,7 @@ griffon-25:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -33,7 +33,7 @@ griffon-26:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -48,7 +48,7 @@ griffon-27:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -46,7 +46,7 @@ griffon-28:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......
......@@ -55,7 +55,7 @@ griffon-29:
version: MT26418
enabled: false
mountable: false
mounted: true
mounted: false
management: false
ib1:
interface: InfiniBand
......