Mentions légales du service

Skip to content
Snippets Groups Projects
Commit ff1cb7c5 authored by POUILLOUX Laurent's avatar POUILLOUX Laurent
Browse files

Merge branch 'master' into wip-2025

parents 831eb45c 0b3a7e19
Branches
No related tags found
7 merge requests!1317Merge master in wip-2025,!1217Merge engelbourg cluster to master,!1199Draft: testing,!1193Draft: [grenoble][vercors3] Add to testing queue,!1185[sophia][mercantour7] add to production queue,!1172Draft: Testing esterel32,!1002Draft: [grenoble][kinovis] Add kinovis cluster
Pipeline #1099227 failed
Stage: .pre
Stage: deploy-to-api-servers
Stage: check
Stage: generate-access-history
Hide whitespace changes
Inline Side-by-side
Showing
with 80 additions and 45 deletions
data/grid5000/sites/grenoble/network_equipments/gw.json
+ 2
− 2
View file @ ff1cb7c5
......@@ -373,13 +373,13 @@
{
"kind": "channel",
"rate": 25000000000,
"snmp_name": "ethernet1/1/67:1",
"snmp_name": "ethernet1/1/67",
"uid": "port-channel50"
},
{
"kind": "channel",
"rate": 25000000000,
"snmp_name": "ethernet1/1/68:1",
"snmp_name": "ethernet1/1/68",
"uid": "port-channel50"
},
{
......
data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json
+ 6
− 10
View file @ ff1cb7c5
......@@ -77,11 +77,6 @@
{
},
{
"kind": "switch",
"rate": 10000000000,
"snmp_name": "1/1/33",
"trunk": false,
"uid": "imag-1b-F1-admin"
},
{
},
......@@ -104,6 +99,11 @@
{
},
{
"kind": "switch",
"rate": 10000000000,
"snmp_name": "1/1/44",
"trunk": false,
"uid": "imag-1b-F1-admin-01"
},
{
},
......@@ -115,13 +115,9 @@
},
{
"kind": "switch",
"rate": 100000000000,
"snmp_name": "1/1/49",
"uid": "imag-1b-F3-prod-01"
},
{
"kind": "switch",
"snmp_name": "1/1/50",
"uid": "imag-1b-F2-prod-01"
}
],
"rate": 25000000000,
......
data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
+ 2
− 6
View file @ ff1cb7c5
......@@ -103,7 +103,7 @@
"rate": 10000000000,
"snmp_name": "1/1/44",
"trunk": false,
"uid": "imag-1b-F2-admin"
"uid": "imag-1b-F2-admin-01"
},
{
},
......@@ -115,12 +115,8 @@
},
{
"kind": "switch",
"rate": 100000000000,
"snmp_name": "1/1/49",
"uid": "imag-1b-F1-prod-01"
},
{
"kind": "switch",
"snmp_name": "1/1/50",
"uid": "imag-1b-F3-prod-01"
}
],
......
data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
+ 9
− 7
View file @ ff1cb7c5
......@@ -125,8 +125,14 @@
{
},
{
"kind": "server",
"snmp_name": "1/1/39",
"uid": "srv-data2"
},
{
"kind": "server",
"snmp_name": "1/1/40",
"uid": "srv-data"
},
{
},
......@@ -139,7 +145,7 @@
"rate": 10000000000,
"snmp_name": "1/1/44",
"trunk": false,
"uid": "imag-1b-F3-admin"
"uid": "imag-1b-F3-admin-01"
},
{
"kind": "server",
......@@ -152,22 +158,18 @@
"uid": "pve-2"
},
{
"kind": "server",
"snmp_name": "1/1/47",
"uid": "srv-data"
},
{
"kind": "server",
"snmp_name": "1/1/48",
"uid": "srv-data2"
},
{
"kind": "switch",
"rate": 100000000000,
"snmp_name": "1/1/49",
"uid": "imag-1b-F2-prod-01"
},
{
"kind": "switch",
"rate": 100000000000,
"snmp_name": "1/1/50",
"uid": "imag-1b-F1-prod-01"
}
......
data/grid5000/sites/grenoble/servers/srv-data.json
+ 1
− 1
View file @ ff1cb7c5
......@@ -13,7 +13,7 @@
},
"default": {
"ip": "172.16.31.15",
"mac": "D4:04:E6:A6:0F:84"
"mac": "D4:04:E6:A6:0F:85"
}
},
"redfish": true,
......
data/grid5000/sites/grenoble/servers/srv-data2.json
+ 1
− 1
View file @ ff1cb7c5
......@@ -13,7 +13,7 @@
},
"default": {
"ip": "172.16.31.16",
"mac": "D4:04:E6:A5:E7:CA"
"mac": "D4:04:E6:A5:E7:CB"
}
},
"redfish": true,
......
data/grid5000/sites/sophia/servers/srv-data4.json 0 → 100644
+ 24
− 0
View file @ ff1cb7c5
{
"group_storage": {
"name": "storage10",
"rate": 50000000000,
"size": 139000000000000
},
"kind": "physical",
"network_adapters": {
"bmc": {
"ip": "172.17.143.7",
"mac": "F4:02:70:9C:CE:5C",
"mounted": true
},
"default": {
"ip": "172.16.143.7",
"mounted": true
}
},
"redfish": true,
"serial": "JSPCWW2",
"type": "server",
"uid": "srv-data4",
"warranty": "2026-04-26"
}
\ No newline at end of file
input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+ 2
− 0
View file @ ff1cb7c5
......@@ -172,10 +172,12 @@ gw:
uid: port-channel50
kind: channel
rate: 25_000_000_000
snmp_pattern: "ethernet1/1/%PORT%"
68:
uid: port-channel50
kind: channel
rate: 25_000_000_000
snmp_pattern: "ethernet1/1/%PORT%"
75:
uid: port-channel30
kind: channel
......
input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml
+ 3
− 5
View file @ ff1cb7c5
......@@ -16,16 +16,14 @@ imag-1b-F1-prod-01:
rate: 25_000_000_000
backplane_bps: 4_800_000_000_000
ports:
33:
uid: imag-1b-F1-admin
44:
uid: imag-1b-F1-admin-01
kind: switch
rate: 10_000_000_000
trunk: false
49:
uid: imag-1b-F3-prod-01
kind: switch
50:
uid: imag-1b-F2-prod-01
kind: switch
rate: 100_000_000_000
channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
+ 2
− 4
View file @ ff1cb7c5
......@@ -17,15 +17,13 @@ imag-1b-F2-prod-01:
backplane_bps: 4_800_000_000_000
ports:
44:
uid: imag-1b-F2-admin
uid: imag-1b-F2-admin-01
kind: switch
rate: 10_000_000_000
trunk: false
49:
uid: imag-1b-F1-prod-01
kind: switch
50:
uid: imag-1b-F3-prod-01
kind: switch
rate: 100_000_000_000
channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+ 9
− 7
View file @ ff1cb7c5
......@@ -33,8 +33,14 @@ imag-1b-F3-prod-01:
uid: chartreuse2-4
22:
uid: nessie-1
39:
uid: srv-data2
kind: server
40:
uid: srv-data
kind: server
44:
uid: imag-1b-F3-admin
uid: imag-1b-F3-admin-01
kind: switch
rate: 10_000_000_000
trunk: false
......@@ -44,18 +50,14 @@ imag-1b-F3-prod-01:
46:
uid: pve-2
kind: server
47:
uid: srv-data
kind: server
48:
uid: srv-data2
kind: server
49:
uid: imag-1b-F2-prod-01
kind: switch
rate: 100_000_000_000
50:
uid: imag-1b-F1-prod-01
kind: switch
rate: 100_000_000_000
channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
channels:
lag1:
......
input/grid5000/sites/grenoble/servers/physical.yaml
+ 2
− 2
View file @ ff1cb7c5
......@@ -111,7 +111,7 @@ srv-data:
network_adapters:
default:
ip: 172.16.31.15
mac: D4:04:E6:A6:0F:84
mac: D4:04:E6:A6:0F:85
bmc:
ip: 172.17.30.15
mac: 5C:ED:8C:F4:A1:EE
......@@ -126,7 +126,7 @@ srv-data2:
network_adapters:
default:
ip: 172.16.31.16
mac: D4:04:E6:A5:E7:CA
mac: D4:04:E6:A5:E7:CB
bmc:
ip: 172.17.30.16
mac: 5C:ED:8C:F4:64:78
......
input/grid5000/sites/sophia/servers/physical.yaml
+ 17
− 0
View file @ ff1cb7c5
......@@ -71,6 +71,23 @@ srv-data2:
size: 198000000000000
rate: 25000000000
srv-data4:
kind: physical
warranty: 2026-04-26
serial: JSPCWW2
network_adapters:
default:
mounted: true
ip: 172.16.143.7
bmc:
mounted: true
ip: 172.17.143.7
mac: F4:02:70:9C:CE:5C
group_storage:
name: storage10
size: 139000000000000
rate: 50000000000
gwol-south:
kind: physical
warranty: 2025-12-27
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment