From cae574e901b04006d5c8060b747516503d0fdf0a Mon Sep 17 00:00:00 2001 From: Juraj Linkeš Date: Fri, 26 Mar 2021 09:30:58 +0100 Subject: ansible: update TX2 VPP Device hugepages and ifs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These interfaces are not used, so remove them until we actually use them. Use less amount of hugepages since we don't need as much and the rest of the memory is more useful for build/host processes. Change-Id: I52b2d6e2812e5cadeab9e51a1bae3688794f414a Signed-off-by: Juraj Linkeš --- .../inventories/lf_inventory/host_vars/10.30.51.70.yaml | 2 +- .../inventories/lf_inventory/host_vars/10.30.51.71.yaml | 2 +- .../roles/vpp_device/files/csit-initialize-vfs-tx2.sh | 12 +++--------- 3 files changed, 5 insertions(+), 11 deletions(-) (limited to 'resources/tools/testbed-setup/ansible') diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml index ad33f0276e..caf80df9ca 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml @@ -6,7 +6,7 @@ inventory_ipmi_hostname: "10.30.50.70" vfs_data_file: "csit-initialize-vfs-tx2.sh" grub: hugepagesz: "2M" - nr_hugepages: 65536 + nr_hugepages: 32768 cpu_microarchitecture: "thunderx2" # User management. diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml index 1712346116..1be446f288 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml @@ -6,7 +6,7 @@ inventory_ipmi_hostname: "10.30.50.71" vfs_data_file: "csit-initialize-vfs-tx2.sh" grub: hugepagesz: "2M" - nr_hugepages: 65536 + nr_hugepages: 32768 cpu_microarchitecture: "thunderx2" # User management. diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh b/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh index b900efcf7c..6c56752ad0 100644 --- a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh +++ b/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2020 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2021 PANTHEON.tech and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -18,11 +18,11 @@ PCI_BLACKLIST=($(lspci -Dmmd ':8070:0200' | cut -f1 -d' ')) # Add I350 Gigabit Network Connection 1521 to blacklist. PCI_BLACKLIST+=($(lspci -Dmmd ':1521:0200' | cut -f1 -d' ')) +# Add MT27800 Family [ConnectX-5] 1017 to blacklist. +PCI_BLACKLIST+=($(lspci -Dmmd ':1017:0200' | cut -f1 -d' ')) # Add Intel Corporation Ethernet Controller XL710 for 40GbE QSFP+ to whitelist. PCI_WHITELIST=($(lspci -Dmmd ':1583:0200' | cut -f1 -d' ')) -# Add MT27800 Family [ConnectX-5] 1017 to whitelist. -PCI_WHITELIST+=($(lspci -Dmmd ':1017:0200' | cut -f1 -d' ')) # See http://pci-ids.ucw.cz/v2.2/pci.ids for more info. @@ -32,9 +32,3 @@ PF_INDICES["0000:05:00.0"]=0 PF_INDICES["0000:05:00.1"]=1 PF_INDICES["0000:91:00.0"]=0 PF_INDICES["0000:91:00.1"]=1 - -# Mellanox NICs -PF_INDICES["0000:0b:00.0"]=2 -PF_INDICES["0000:0b:00.1"]=3 -PF_INDICES["0000:9a:00.0"]=2 -PF_INDICES["0000:9a:00.1"]=3 -- cgit 1.2.3-korg