Mentions légales du service

Skip to content
Snippets Groups Projects
Commit e23e7031 authored by JACQUOT Pierre's avatar JACQUOT Pierre
Browse files

Merge branch 'ecotype-exception' into 'master' 

[nantes][ecotype] disable eth1 from ecotype-1 and ecotype-47

See merge request !802
parents 4b61921d dccd86d2
Branches
No related tags found
1 merge request!802[nantes][ecotype] disable eth1 from ecotype-1 and ecotype-47
Pipeline #1050408 passed with warnings
Stage: .pre
Stage: validate
Stage: generate
Stage: deploy
Stage: checks
Stage: .post
Hide whitespace changes
Inline Side-by-side
Showing
with 453 additions and 120 deletions
data/grid5000/accesses/refrepo.json
+ 6
− 18
View file @ e23e7031
......@@ -87119,24 +87119,18 @@
{
"device": "eth1",
"driver": "ixgbe",
"enabled": true,
"enabled": false,
"firmware_version": "0x8000095c, 19.5.12",
"interface": "Ethernet",
"ip": "172.16.194.1",
"ip6": "2001:660:4406:600:2:1:0:1",
"kavlan": true,
"kavlan": false,
"mac": "24:6e:96:6a:46:e2",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"name": "eno2",
"network_address": "ecotype-1-eth1.nantes.grid5000.fr",
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
"switch": "ecotype-prod2",
"switch_port": "TenGigabitEthernet 1/1",
"vendor": "Intel"
},
{
......@@ -94540,24 +94534,18 @@
{
"device": "eth1",
"driver": "ixgbe",
"enabled": true,
"enabled": false,
"firmware_version": "0x8000095c, 19.5.12",
"interface": "Ethernet",
"ip": "172.16.194.47",
"ip6": "2001:660:4406:600:2:1:0:2f",
"kavlan": true,
"kavlan": false,
"mac": "24:6e:96:6a:d1:ea",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"name": "eno2",
"network_address": "ecotype-47-eth1.nantes.grid5000.fr",
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
"switch": "ecotype-prod2",
"switch_port": "TenGigabitEthernet 1/47",
"vendor": "Intel"
},
{
data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+ 384
− 0
View file @ e23e7031
......@@ -448,6 +448,54 @@
"interface": "eth1"
},
"name": "network_ifacein_bytes_total",
"only_for": [
"ecotype-2",
"ecotype-3",
"ecotype-4",
"ecotype-5",
"ecotype-6",
"ecotype-7",
"ecotype-8",
"ecotype-9",
"ecotype-10",
"ecotype-11",
"ecotype-12",
"ecotype-13",
"ecotype-14",
"ecotype-15",
"ecotype-16",
"ecotype-17",
"ecotype-18",
"ecotype-19",
"ecotype-20",
"ecotype-21",
"ecotype-22",
"ecotype-23",
"ecotype-24",
"ecotype-25",
"ecotype-26",
"ecotype-27",
"ecotype-28",
"ecotype-29",
"ecotype-30",
"ecotype-31",
"ecotype-32",
"ecotype-33",
"ecotype-34",
"ecotype-35",
"ecotype-36",
"ecotype-37",
"ecotype-38",
"ecotype-39",
"ecotype-40",
"ecotype-41",
"ecotype-42",
"ecotype-43",
"ecotype-44",
"ecotype-45",
"ecotype-46",
"ecotype-48"
],
"period": 1000,
"source": {
"protocol": "network_equipment"
......@@ -459,6 +507,54 @@
"interface": "eth1"
},
"name": "network_ifaceout_bytes_total",
"only_for": [
"ecotype-2",
"ecotype-3",
"ecotype-4",
"ecotype-5",
"ecotype-6",
"ecotype-7",
"ecotype-8",
"ecotype-9",
"ecotype-10",
"ecotype-11",
"ecotype-12",
"ecotype-13",
"ecotype-14",
"ecotype-15",
"ecotype-16",
"ecotype-17",
"ecotype-18",
"ecotype-19",
"ecotype-20",
"ecotype-21",
"ecotype-22",
"ecotype-23",
"ecotype-24",
"ecotype-25",
"ecotype-26",
"ecotype-27",
"ecotype-28",
"ecotype-29",
"ecotype-30",
"ecotype-31",
"ecotype-32",
"ecotype-33",
"ecotype-34",
"ecotype-35",
"ecotype-36",
"ecotype-37",
"ecotype-38",
"ecotype-39",
"ecotype-40",
"ecotype-41",
"ecotype-42",
"ecotype-43",
"ecotype-44",
"ecotype-45",
"ecotype-46",
"ecotype-48"
],
"period": 1000,
"source": {
"protocol": "network_equipment"
......@@ -470,6 +566,54 @@
"interface": "eth1"
},
"name": "network_ifacein_packets_total",
"only_for": [
"ecotype-2",
"ecotype-3",
"ecotype-4",
"ecotype-5",
"ecotype-6",
"ecotype-7",
"ecotype-8",
"ecotype-9",
"ecotype-10",
"ecotype-11",
"ecotype-12",
"ecotype-13",
"ecotype-14",
"ecotype-15",
"ecotype-16",
"ecotype-17",
"ecotype-18",
"ecotype-19",
"ecotype-20",
"ecotype-21",
"ecotype-22",
"ecotype-23",
"ecotype-24",
"ecotype-25",
"ecotype-26",
"ecotype-27",
"ecotype-28",
"ecotype-29",
"ecotype-30",
"ecotype-31",
"ecotype-32",
"ecotype-33",
"ecotype-34",
"ecotype-35",
"ecotype-36",
"ecotype-37",
"ecotype-38",
"ecotype-39",
"ecotype-40",
"ecotype-41",
"ecotype-42",
"ecotype-43",
"ecotype-44",
"ecotype-45",
"ecotype-46",
"ecotype-48"
],
"period": 1000,
"source": {
"protocol": "network_equipment"
......@@ -481,6 +625,54 @@
"interface": "eth1"
},
"name": "network_ifaceout_packets_total",
"only_for": [
"ecotype-2",
"ecotype-3",
"ecotype-4",
"ecotype-5",
"ecotype-6",
"ecotype-7",
"ecotype-8",
"ecotype-9",
"ecotype-10",
"ecotype-11",
"ecotype-12",
"ecotype-13",
"ecotype-14",
"ecotype-15",
"ecotype-16",
"ecotype-17",
"ecotype-18",
"ecotype-19",
"ecotype-20",
"ecotype-21",
"ecotype-22",
"ecotype-23",
"ecotype-24",
"ecotype-25",
"ecotype-26",
"ecotype-27",
"ecotype-28",
"ecotype-29",
"ecotype-30",
"ecotype-31",
"ecotype-32",
"ecotype-33",
"ecotype-34",
"ecotype-35",
"ecotype-36",
"ecotype-37",
"ecotype-38",
"ecotype-39",
"ecotype-40",
"ecotype-41",
"ecotype-42",
"ecotype-43",
"ecotype-44",
"ecotype-45",
"ecotype-46",
"ecotype-48"
],
"period": 1000,
"source": {
"protocol": "network_equipment"
......@@ -492,6 +684,54 @@
"interface": "eth1"
},
"name": "network_ifacein_packets_discard_total",
"only_for": [
"ecotype-2",
"ecotype-3",
"ecotype-4",
"ecotype-5",
"ecotype-6",
"ecotype-7",
"ecotype-8",
"ecotype-9",
"ecotype-10",
"ecotype-11",
"ecotype-12",
"ecotype-13",
"ecotype-14",
"ecotype-15",
"ecotype-16",
"ecotype-17",
"ecotype-18",
"ecotype-19",
"ecotype-20",
"ecotype-21",
"ecotype-22",
"ecotype-23",
"ecotype-24",
"ecotype-25",
"ecotype-26",
"ecotype-27",
"ecotype-28",
"ecotype-29",
"ecotype-30",
"ecotype-31",
"ecotype-32",
"ecotype-33",
"ecotype-34",
"ecotype-35",
"ecotype-36",
"ecotype-37",
"ecotype-38",
"ecotype-39",
"ecotype-40",
"ecotype-41",
"ecotype-42",
"ecotype-43",
"ecotype-44",
"ecotype-45",
"ecotype-46",
"ecotype-48"
],
"period": 1000,
"source": {
"protocol": "network_equipment"
......@@ -503,6 +743,54 @@
"interface": "eth1"
},
"name": "network_ifaceout_packets_discard_total",
"only_for": [
"ecotype-2",
"ecotype-3",
"ecotype-4",
"ecotype-5",
"ecotype-6",
"ecotype-7",
"ecotype-8",
"ecotype-9",
"ecotype-10",
"ecotype-11",
"ecotype-12",
"ecotype-13",
"ecotype-14",
"ecotype-15",
"ecotype-16",
"ecotype-17",
"ecotype-18",
"ecotype-19",
"ecotype-20",
"ecotype-21",
"ecotype-22",
"ecotype-23",
"ecotype-24",
"ecotype-25",
"ecotype-26",
"ecotype-27",
"ecotype-28",
"ecotype-29",
"ecotype-30",
"ecotype-31",
"ecotype-32",
"ecotype-33",
"ecotype-34",
"ecotype-35",
"ecotype-36",
"ecotype-37",
"ecotype-38",
"ecotype-39",
"ecotype-40",
"ecotype-41",
"ecotype-42",
"ecotype-43",
"ecotype-44",
"ecotype-45",
"ecotype-46",
"ecotype-48"
],
"period": 1000,
"source": {
"protocol": "network_equipment"
......@@ -514,6 +802,54 @@
"interface": "eth1"
},
"name": "network_ifacein_packets_error_total",
"only_for": [
"ecotype-2",
"ecotype-3",
"ecotype-4",
"ecotype-5",
"ecotype-6",
"ecotype-7",
"ecotype-8",
"ecotype-9",
"ecotype-10",
"ecotype-11",
"ecotype-12",
"ecotype-13",
"ecotype-14",
"ecotype-15",
"ecotype-16",
"ecotype-17",
"ecotype-18",
"ecotype-19",
"ecotype-20",
"ecotype-21",
"ecotype-22",
"ecotype-23",
"ecotype-24",
"ecotype-25",
"ecotype-26",
"ecotype-27",
"ecotype-28",
"ecotype-29",
"ecotype-30",
"ecotype-31",
"ecotype-32",
"ecotype-33",
"ecotype-34",
"ecotype-35",
"ecotype-36",
"ecotype-37",
"ecotype-38",
"ecotype-39",
"ecotype-40",
"ecotype-41",
"ecotype-42",
"ecotype-43",
"ecotype-44",
"ecotype-45",
"ecotype-46",
"ecotype-48"
],
"period": 1000,
"source": {
"protocol": "network_equipment"
......@@ -525,6 +861,54 @@
"interface": "eth1"
},
"name": "network_ifaceout_packets_error_total",
"only_for": [
"ecotype-2",
"ecotype-3",
"ecotype-4",
"ecotype-5",
"ecotype-6",
"ecotype-7",
"ecotype-8",
"ecotype-9",
"ecotype-10",
"ecotype-11",
"ecotype-12",
"ecotype-13",
"ecotype-14",
"ecotype-15",
"ecotype-16",
"ecotype-17",
"ecotype-18",
"ecotype-19",
"ecotype-20",
"ecotype-21",
"ecotype-22",
"ecotype-23",
"ecotype-24",
"ecotype-25",
"ecotype-26",
"ecotype-27",
"ecotype-28",
"ecotype-29",
"ecotype-30",
"ecotype-31",
"ecotype-32",
"ecotype-33",
"ecotype-34",
"ecotype-35",
"ecotype-36",
"ecotype-37",
"ecotype-38",
"ecotype-39",
"ecotype-40",
"ecotype-41",
"ecotype-42",
"ecotype-43",
"ecotype-44",
"ecotype-45",
"ecotype-46",
"ecotype-48"
],
"period": 1000,
"source": {
"protocol": "network_equipment"
......
data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
+ 3
− 49
View file @ e23e7031
......@@ -40,26 +40,6 @@
"kavlan-7": "10.44.193.1",
"kavlan-8": "10.45.1.1",
"kavlan-9": "10.45.65.1"
},
"eth1": {
"kavlan-1": "192.168.194.1",
"kavlan-11": "10.7.241.101",
"kavlan-12": "10.11.241.101",
"kavlan-13": "10.15.241.101",
"kavlan-14": "10.19.241.101",
"kavlan-16": "10.27.241.101",
"kavlan-17": "10.31.241.101",
"kavlan-18": "10.35.241.101",
"kavlan-2": "192.168.210.1",
"kavlan-20": "10.43.241.101",
"kavlan-21": "10.47.241.101",
"kavlan-3": "192.168.226.1",
"kavlan-4": "10.44.2.1",
"kavlan-5": "10.44.66.1",
"kavlan-6": "10.44.130.1",
"kavlan-7": "10.44.194.1",
"kavlan-8": "10.45.2.1",
"kavlan-9": "10.45.66.1"
}
},
"kavlan6": {
......@@ -82,26 +62,6 @@
"kavlan-7": "2001:660:4406:693:2::1",
"kavlan-8": "2001:660:4406:694:2::1",
"kavlan-9": "2001:660:4406:695:2::1"
},
"eth1": {
"kavlan-1": "2001:660:4406:680:2:1:0:1",
"kavlan-11": "2001:660:4406:1a0:602:1:0:1",
"kavlan-12": "2001:660:4406:2a0:602:1:0:1",
"kavlan-13": "2001:660:4406:4a0:602:1:0:1",
"kavlan-14": "2001:660:4406:5a0:602:1:0:1",
"kavlan-16": "2001:660:4406:7a0:602:1:0:1",
"kavlan-17": "2001:660:4406:9a0:602:1:0:1",
"kavlan-18": "2001:660:4406:8a0:602:1:0:1",
"kavlan-2": "2001:660:4406:681:2:1:0:1",
"kavlan-20": "2001:660:4406:3a0:602:1:0:1",
"kavlan-21": "2001:660:4406:6a0:602:1:0:1",
"kavlan-3": "2001:660:4406:682:2:1:0:1",
"kavlan-4": "2001:660:4406:690:2:1:0:1",
"kavlan-5": "2001:660:4406:691:2:1:0:1",
"kavlan-6": "2001:660:4406:692:2:1:0:1",
"kavlan-7": "2001:660:4406:693:2:1:0:1",
"kavlan-8": "2001:660:4406:694:2:1:0:1",
"kavlan-9": "2001:660:4406:695:2:1:0:1"
}
},
"main_memory": {
......@@ -182,24 +142,18 @@
{
"device": "eth1",
"driver": "ixgbe",
"enabled": true,
"enabled": false,
"firmware_version": "0x8000095c, 19.5.12",
"interface": "Ethernet",
"ip": "172.16.194.1",
"ip6": "2001:660:4406:600:2:1:0:1",
"kavlan": true,
"kavlan": false,
"mac": "24:6e:96:6a:46:e2",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"name": "eno2",
"network_address": "ecotype-1-eth1.nantes.grid5000.fr",
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
"switch": "ecotype-prod2",
"switch_port": "TenGigabitEthernet 1/1",
"vendor": "Intel"
},
{
......
data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
+ 3
− 49
View file @ e23e7031
......@@ -40,26 +40,6 @@
"kavlan-7": "10.44.193.47",
"kavlan-8": "10.45.1.47",
"kavlan-9": "10.45.65.47"
},
"eth1": {
"kavlan-1": "192.168.194.47",
"kavlan-11": "10.7.241.147",
"kavlan-12": "10.11.241.147",
"kavlan-13": "10.15.241.147",
"kavlan-14": "10.19.241.147",
"kavlan-16": "10.27.241.147",
"kavlan-17": "10.31.241.147",
"kavlan-18": "10.35.241.147",
"kavlan-2": "192.168.210.47",
"kavlan-20": "10.43.241.147",
"kavlan-21": "10.47.241.147",
"kavlan-3": "192.168.226.47",
"kavlan-4": "10.44.2.47",
"kavlan-5": "10.44.66.47",
"kavlan-6": "10.44.130.47",
"kavlan-7": "10.44.194.47",
"kavlan-8": "10.45.2.47",
"kavlan-9": "10.45.66.47"
}
},
"kavlan6": {
......@@ -82,26 +62,6 @@
"kavlan-7": "2001:660:4406:693:2::2f",
"kavlan-8": "2001:660:4406:694:2::2f",
"kavlan-9": "2001:660:4406:695:2::2f"
},
"eth1": {
"kavlan-1": "2001:660:4406:680:2:1:0:2f",
"kavlan-11": "2001:660:4406:1a0:602:1:0:2f",
"kavlan-12": "2001:660:4406:2a0:602:1:0:2f",
"kavlan-13": "2001:660:4406:4a0:602:1:0:2f",
"kavlan-14": "2001:660:4406:5a0:602:1:0:2f",
"kavlan-16": "2001:660:4406:7a0:602:1:0:2f",
"kavlan-17": "2001:660:4406:9a0:602:1:0:2f",
"kavlan-18": "2001:660:4406:8a0:602:1:0:2f",
"kavlan-2": "2001:660:4406:681:2:1:0:2f",
"kavlan-20": "2001:660:4406:3a0:602:1:0:2f",
"kavlan-21": "2001:660:4406:6a0:602:1:0:2f",
"kavlan-3": "2001:660:4406:682:2:1:0:2f",
"kavlan-4": "2001:660:4406:690:2:1:0:2f",
"kavlan-5": "2001:660:4406:691:2:1:0:2f",
"kavlan-6": "2001:660:4406:692:2:1:0:2f",
"kavlan-7": "2001:660:4406:693:2:1:0:2f",
"kavlan-8": "2001:660:4406:694:2:1:0:2f",
"kavlan-9": "2001:660:4406:695:2:1:0:2f"
}
},
"main_memory": {
......@@ -182,24 +142,18 @@
{
"device": "eth1",
"driver": "ixgbe",
"enabled": true,
"enabled": false,
"firmware_version": "0x8000095c, 19.5.12",
"interface": "Ethernet",
"ip": "172.16.194.47",
"ip6": "2001:660:4406:600:2:1:0:2f",
"kavlan": true,
"kavlan": false,
"mac": "24:6e:96:6a:d1:ea",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"name": "eno2",
"network_address": "ecotype-47-eth1.nantes.grid5000.fr",
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
"switch": "ecotype-prod2",
"switch_port": "TenGigabitEthernet 1/47",
"vendor": "Intel"
},
{
......
input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
+ 20
− 2
View file @ e23e7031
......@@ -9,6 +9,26 @@ queues:
- default
nodes:
ecotype-1:
network_adapters:
eth1:
enabled: false
mountable: false
ecotype-47:
network_adapters:
eth1:
enabled: false
mountable: false
ecotype-[2-46]:
network_adapters:
eth1:
enabled: true
mountable: true
ecotype-48:
network_adapters:
eth1:
enabled: true
mountable: true
ecotype-[1-48]:
processor:
microarchitecture: Broadwell
......@@ -28,8 +48,6 @@ nodes:
mountable: true
eth1:
mounted: false
enabled: true
mountable: true
eth2:
mounted: false
enabled: false
......
input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+ 0
− 1
View file @ e23e7031
......@@ -69,7 +69,6 @@ ecotype-1:
management: false
model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
name: eno2
rate: 10000000000
sriov: true
sriov_totalvfs: 63
vendor: Intel
......
input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+ 0
− 1
View file @ e23e7031
......@@ -69,7 +69,6 @@ ecotype-47:
management: false
model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
name: eno2
rate: 10000000000
sriov: true
sriov_totalvfs: 63
vendor: Intel
......
lib/refrepo/valid/data/homogeneity.yaml.erb
+ 37
− 0
View file @ e23e7031
......@@ -288,6 +288,43 @@ nantes:
- ~network_adapters.eth0.firmware_version
- ~network_adapters.eth1.firmware_version
- ~storage_devices.pci-0000:00:1f.2-ata-1.firmware_version
ecotype-2:
- ~network_adapters.eth1.enabled
- ~network_adapters.eth1.mountable
- ~network_adapters.eth1.kavlan
- +network_adapters.eth1.ip
- +network_adapters.eth1.ip6
- +network_adapters.eth1.network_address
- +network_adapters.eth1.rate
- +network_adapters.eth1.switch
- +network_adapters.eth1.switch_port
- +kavlan.eth1
- +kavlan6.eth1
ecotype-47:
- ~network_adapters.eth1.enabled
- ~network_adapters.eth1.mountable
- ~network_adapters.eth1.kavlan
- -network_adapters.eth1.ip
- -network_adapters.eth1.ip6
- -network_adapters.eth1.network_address
- -network_adapters.eth1.rate
- -network_adapters.eth1.switch
- -network_adapters.eth1.switch_port
- -kavlan.eth1
- -kavlan6.eth1
ecotype-48:
- ~network_adapters.eth1.enabled
- ~network_adapters.eth1.mountable
- ~network_adapters.eth1.kavlan
- +network_adapters.eth1.ip
- +network_adapters.eth1.ip6
- +network_adapters.eth1.network_address
- +network_adapters.eth1.rate
- +network_adapters.eth1.switch
- +network_adapters.eth1.switch_port
- +kavlan.eth1
- +kavlan6.eth1
rennes:
paradoxe-[2-3]:
- ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.firmware_version
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment