From c86e36b1c19e21444e1bb6a9a65fc8f66f68bb04 Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 17 Jan 2024 11:45:05 +0000 Subject: feat(device): Add 1n-alt vpp device Signed-off-by: Peter Mikus Change-Id: I3d2bb0408f15fd14989d1179d7f08710a3d86e67 --- .../lf_inventory/host_vars/10.30.51.70.yaml | 20 ++++++------- .../lf_inventory/host_vars/10.30.51.71.yaml | 18 ++++++------ .../roles/vpp_device/defaults/main.yaml | 6 ---- .../vpp_device/files/csit-initialize-vfs-alt.sh | 34 ++++++++++++++++++++++ .../roles/vpp_device/tasks/main.yaml | 7 ----- .../roles/vpp_device/tasks/thunderx2.yaml | 23 --------------- 6 files changed, 53 insertions(+), 55 deletions(-) delete mode 100644 fdio.infra.ansible/roles/vpp_device/defaults/main.yaml create mode 100644 fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-alt.sh delete mode 100644 fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml (limited to 'fdio.infra.ansible') diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml index ab533c02bb..556e2b29fb 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml @@ -1,14 +1,14 @@ --- # file: host_vars/10.30.51.70.yaml -hostname: "s55-t13-sut1" -inventory_ipmi_hostname: "10.30.50.70" -vfs_data_file: "csit-initialize-vfs-tx2.sh" +hostname: "s70-t13-sut1" grub: hugepagesz: "2M" hugepages: 32768 iommu.passthrough: "1" -cpu_microarchitecture: "thunderx2" +inventory_ipmi_hostname: "10.30.50.70" +vfs_data_file: "csit-initialize-vfs-alt.sh" +cpu_microarchitecture: "altra" intel_700_matrix: "dpdk22.07" @@ -60,12 +60,11 @@ nomad_servers: - "10.30.51.23:4647" - "10.30.51.24:4647" - "10.30.51.25:4647" -nomad_cpu_total_compute: "40000" # Consul settigs. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -91,7 +90,8 @@ vault_version: "1.13.1" # Docker settings. docker_daemon: - dns: ["172.17.0.1"] - dns-opts: [] - dns-search: ["{{ansible_hostname}}"] - storage-driver: "overlay2" + default-shm-size: "1073741824" +# dns: ["172.17.0.1"] +# dns-opts: [] +# dns-search: ["{{ansible_hostname}}"] +# host: ["172.17.0.1:/var/run/docker.sock"] diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml index 1ac36623eb..519923704e 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml @@ -1,13 +1,13 @@ --- # file: host_vars/10.30.51.71.yaml -hostname: "s56-t14-sut1" -inventory_ipmi_hostname: "10.30.50.71" -vfs_data_file: "csit-initialize-vfs-tx2.sh" +hostname: "s71-t14-sut1" grub: hugepagesz: "2M" hugepages: 32768 iommu.passthrough: "1" +inventory_ipmi_hostname: "10.30.50.71" +vfs_data_file: "csit-initialize-vfs-alt.sh" cpu_microarchitecture: "thunderx2" intel_700_matrix: "dpdk22.07" @@ -60,12 +60,11 @@ nomad_servers: - "10.30.51.23:4647" - "10.30.51.24:4647" - "10.30.51.25:4647" -nomad_cpu_total_compute: "40000" # Consul settigs. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -91,7 +90,8 @@ vault_version: "1.13.1" # Docker settings. docker_daemon: - dns: ["172.17.0.1"] - dns-opts: [] - dns-search: ["{{ansible_hostname}}"] - storage-driver: "overlay2" + default-shm-size: "1073741824" +# dns: ["172.17.0.1"] +# dns-opts: [] +# dns-search: ["{{ansible_hostname}}"] +# host: ["172.17.0.1:/var/run/docker.sock"] diff --git a/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml b/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml deleted file mode 100644 index 377b910a42..0000000000 --- a/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# file: defaults/main.yaml - -iavf_target_dir: "/opt" -iavf_version: "4.1.1" -iavf_url: "https://downloads.sourceforge.net/project/e1000/iavf%20stable/{{ iavf_version }}/iavf-{{ iavf_version }}.tar.gz?ts=gAAAAABgvfs_L6gSH8B09NfEc8fzoooS3M2wyuOxlFEK5EtTstZWFdb2dYcqJZNqiirAT87dbc3GeJJrRst9KfUgS-byAeyaLw%3D%3D&r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fe1000%2Ffiles%2Fiavf%2520stable%2F{{ iavf_version }}%2Fiavf-{{ iavf_version }}.tar.gz%2Fdownload" diff --git a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-alt.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-alt.sh new file mode 100644 index 0000000000..e3b22a2ef1 --- /dev/null +++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-alt.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# Copyright (c) 2023 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: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Add QLogic Corp. FastLinQ QL41000 Series 10/25/40/50GbE Controller to +# blacklist. +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' ')) + +# See http://pci-ids.ucw.cz/v2.2/pci.ids for more info. + +declare -A PF_INDICES +# Intel NICs +PF_INDICES["0000:01:00.0"]=0 +PF_INDICES["0000:01:00.1"]=1 +PF_INDICES["0003:02:00.0"]=0 +PF_INDICES["0003:02:00.1"]=1 diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml index 88d4ddb1a0..5e98be2f84 100644 --- a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml +++ b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml @@ -1,13 +1,6 @@ --- # file: tasks/main.yaml -- name: "ThunderX2 Kernel Modules Config" - import_tasks: "thunderx2.yaml" - when: - - cpu_microarchitecture == "thunderx2" - tags: - - conf-kernel-modules - - name: "Disable IPv6 Router Advertisement" ansible.builtin.sysctl: name: "net.ipv6.conf.default.accept_ra" diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml deleted file mode 100644 index 618a65ad7f..0000000000 --- a/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# file: tasks/thunderx2.yaml - -- name: Load Kernel Modules On Startup (vfio-pci) - ansible.builtin.lineinfile: - path: "/etc/modules" - state: "present" - line: "{{ item }}" - with_items: - - "vfio-pci" - tags: - - load-kernel-modules - -- name: Disable Kernel Modules On Startup (cppc_cpufreq) - ansible.builtin.lineinfile: - path: "/etc/modprobe.d/blacklist-cppc_cpufreq.conf" - state: "present" - line: "{{ item }}" - create: "yes" - with_items: - - "blacklist cppc_cpufreq" - tags: - - disable-kernel-modules -- cgit 1.2.3-korg