Commit f1a98eb8 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/graphique/graphique.rb
	generators/input/sites/nancy/clusters/graphite/graphite.rb
parents dfeddacc 5560a70d
......@@ -32,8 +32,8 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.33.4",
"ip6": "fe80::862b:2bff:fe70:c621",
"mac": "84:2b:2b:70:cc:89",
"ip6": "fe80::862b:2bff:fe48:3143",
"mac": "84:2b:2b:48:31:43",
"management": false,
"mountable": true,
"mounted": true,
......@@ -50,7 +50,7 @@
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"mac": "84:2b:2b:70:cc:8a",
"mac": "84:2b:2b:48:31:44",
"management": false,
"mountable": true,
"mounted": false,
......@@ -63,7 +63,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.33.104",
"mac": "84:2b:2b:70:cc:8b",
"mac": "84:2b:2b:48:31:45",
"management": true,
"mountable": false,
"mounted": false,
......
......@@ -4,7 +4,7 @@
"model": "Dell PowerEdge R630",
"queues": [
"admin",
"testing"
"production"
],
"type": "cluster",
"uid": "graoully"
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 3600,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 172800,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 172800,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 172800,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 31536000,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 31536000,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 31536000,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 31536000,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 3600,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 3600,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 7200,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 7200,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 7200,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 86400,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 86400,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -223,10 +223,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 86400,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -144,7 +144,7 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 31536000,
"queues": [
"admin",
"production"
......
......@@ -144,7 +144,7 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 31536000,
"queues": [
"admin",
"production"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment