Commit ea12571a authored by Hyacinthe Cartiaux's avatar Hyacinthe Cartiaux

Merge branch 'master' of github.com:grid5000/reference-repository

parents 69c41c1f a92a764f
......@@ -3,7 +3,7 @@
"kavlan": true,
"model": "Dell PowerEdge R730",
"queues": [
"testing",
"production",
"admin"
],
"type": "cluster",
......
......@@ -145,10 +145,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 86400,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -145,10 +145,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 86400,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -145,10 +145,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 172800,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -145,10 +145,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 172800,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -145,10 +145,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 31536000,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -145,10 +145,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
"max_walltime": 0,
"max_walltime": 31536000,
"queues": [
"admin",
"testing"
"production"
],
"virtual": "ivt"
},
......
......@@ -193,85 +193,6 @@
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgravillon1",
"vlans": {
"naming_pattern": "Vlan%VLANID%",
"vlan100": {
"addresses": [
"172.16.79.254"
],
"administrative": true
},
"vlan101": {
"addresses": [
"172.17.79.254"
]
},
"vlan500": {
"addresses": [
"192.168.4.14"
]
},
"vlan701": {
"addresses": [
"192.168.192.0/20"
],
"name": "kavlan-1"
},
"vlan702": {
"addresses": [
"192.168.208.0/20"
],
"name": "kavlan-2"
},
"vlan703": {
"addresses": [
"192.168.224.0/20"
],
"name": "kavlan-3"
},
"vlan704": {
"addresses": [
"10.16.0.0/18"
],
"name": "kavlan-4"
},
"vlan705": {
"addresses": [
"10.16.64.0/18"
],
"name": "kavlan-5"
},
"vlan706": {
"addresses": [
"10.16.128.0/18"
],
"name": "kavlan-6"
},
"vlan707": {
"addresses": [
"10.16.192.0/18"
],
"name": "kavlan-7"
},
"vlan708": {
"addresses": [
"10.17.0.0/18"
],
"name": "kavlan-8"
},
"vlan709": {
"addresses": [
"10.17.64.0/18"
],
"name": "kavlan-9"
},
"vlan714": {
"addresses": [
"10.19.192.0/18"
],
"name": "kavlan-14"
}
},
"weathermap": {
}
}
\ No newline at end of file
......@@ -4,7 +4,7 @@ model: Dell PowerEdge R730
created_at: 2016-08-30
kavlan: true
queues:
- testing
- production
- admin
nodes:
......@@ -27,8 +27,7 @@ nodes:
besteffort: true
queues:
- admin
- testing
max_walltime: 0
- production
gpu:
gpu: true
gpu_count: 2
......@@ -49,3 +48,13 @@ nodes:
driver: megaraid_sas
storage: HDD
vendor: Seagate
grimani-[5-6]:
supported_job_types:
max_walltime: 31536000
grimani-[3-4]:
supported_job_types:
max_walltime: 172800
grimani-[1-2]:
supported_job_types:
max_walltime: 86400
......@@ -9,58 +9,6 @@ sgravillon1:
available: true
resolution: 1
mtu: 9220
vlans:
naming_pattern: Vlan%VLANID%
"vlan100":
administrative: yes
addresses:
- 172.16.79.254
"vlan101":
addresses:
- 172.17.79.254
"vlan500":
addresses:
- 192.168.4.14
"vlan701":
name: kavlan-1
addresses:
- 192.168.192.0/20
"vlan702":
name: kavlan-2
addresses:
- 192.168.208.0/20
"vlan703":
name: kavlan-3
addresses:
- 192.168.224.0/20
"vlan704":
name: kavlan-4
addresses:
- 10.16.0.0/18
"vlan705":
name: kavlan-5
addresses:
- 10.16.64.0/18
"vlan706":
name: kavlan-6
addresses:
- 10.16.128.0/18
"vlan707":
name: kavlan-7
addresses:
- 10.16.192.0/18
"vlan708":
name: kavlan-8
addresses:
- 10.17.0.0/18
"vlan709":
name: kavlan-9
addresses:
- 10.17.64.0/18
"vlan714":
name: kavlan-14
addresses:
- 10.19.192.0/18
routes: {}
backplane_bps: 346000000000
linecards:
......
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