From 99a0ec18cb9117e9c22b4416c97d603215e3fa8b Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 22 Jun 2022 11:01:17 +0000 Subject: [PATCH] feat(ansible): Add ICX Signed-off-by: Peter Mikus Change-Id: I3a62dc7048102381598b3e0dfc16f82fad834d7b --- .../lf_inventory/host_vars/10.30.51.78.yaml | 33 ++++++++++++++++++++++ .../lf_inventory/host_vars/10.30.51.79.yaml | 33 ++++++++++++++++++++++ .../lf_inventory/host_vars/10.30.51.80.yaml | 33 ++++++++++++++++++++++ .../lf_inventory/host_vars/10.30.51.81.yaml | 6 ++-- .../lf_inventory/host_vars/10.30.51.82.yaml | 6 ++-- .../lf_inventory/host_vars/10.30.51.83.yaml | 33 ++++++++++++++++++++++ .../lf_inventory/host_vars/10.30.51.84.yaml | 33 ++++++++++++++++++++++ .../lf_inventory/host_vars/10.30.51.85.yaml | 33 ++++++++++++++++++++++ .../lf_inventory/host_vars/10.30.51.86.yaml | 33 ++++++++++++++++++++++ .../lf_inventory/host_vars/10.30.51.87.yaml | 33 ++++++++++++++++++++++ .../lf_inventory/host_vars/10.30.51.88.yaml | 33 ++++++++++++++++++++++ fdio.infra.ansible/inventories/lf_inventory/hosts | 9 ++++++ fdio.infra.ansible/roles/intel/tasks/ice.yaml | 18 ++++++------ fdio.infra.ansible/roles/intel/tasks/main.yaml | 2 +- fdio.infra.ansible/roles/mellanox/tasks/main.yaml | 3 +- 15 files changed, 324 insertions(+), 17 deletions(-) create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.78.yaml create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.79.yaml create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.83.yaml create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.85.yaml create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.87.yaml create mode 100644 fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.78.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.78.yaml new file mode 100644 index 0000000000..71d4245580 --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.78.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.78.yaml + +hostname: "s78-t38-sut1" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.78" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk22.03" +intel_800_matrix: "dpdk22.03" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.79.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.79.yaml new file mode 100644 index 0000000000..d57803d525 --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.79.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.79.yaml + +hostname: "s79-t38-sut2" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.79" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk22.03" +intel_800_matrix: "dpdk22.03" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml new file mode 100644 index 0000000000..b1a5404498 --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.80.yaml + +hostname: "s80-t38-tg1" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.80" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk21.02" +intel_800_matrix: "dpdk21.02" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.81.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.81.yaml index 7133f18f59..f70c121bc3 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.81.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.81.yaml @@ -1,7 +1,7 @@ --- -# file: host_vars/10.30.51.82.yaml +# file: host_vars/10.30.51.81.yaml -hostname: "s72-t212-tg1" +hostname: "s71-t212-sut1" grub: audit: "0" default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" @@ -26,7 +26,7 @@ sysctl: nr_hugepages: 32768 max_map_count: 20000 -inventory_ipmi_hostname: "10.30.50.82" +inventory_ipmi_hostname: "10.30.50.81" cpu_microarchitecture: "icelake" intel_700_matrix: "dpdk21.02" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml index 76ed4ce4ca..828189d45d 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml @@ -1,7 +1,7 @@ --- -# file: host_vars/10.30.51.81.yaml +# file: host_vars/10.30.51.82.yaml -hostname: "s71-t212-sut1" +hostname: "s72-t212-tg1" grub: audit: "0" default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" @@ -26,7 +26,7 @@ sysctl: nr_hugepages: 32768 max_map_count: 20000 -inventory_ipmi_hostname: "10.30.50.81" +inventory_ipmi_hostname: "10.30.50.82" cpu_microarchitecture: "icelake" intel_700_matrix: "dpdk22.03" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.83.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.83.yaml new file mode 100644 index 0000000000..a1c5a81233 --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.83.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.83.yaml + +hostname: "s83-t213-sut1" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.83" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk21.02" +intel_800_matrix: "dpdk21.02" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml new file mode 100644 index 0000000000..c9e998b8fa --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.84.yaml + +hostname: "s84-t213-tg1" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.84" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk22.03" +intel_800_matrix: "dpdk22.03" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.85.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.85.yaml new file mode 100644 index 0000000000..31373e558c --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.85.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.85.yaml + +hostname: "s85-t214-sut1" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.85" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk21.02" +intel_800_matrix: "dpdk21.02" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml new file mode 100644 index 0000000000..24f0f517af --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.86.yaml + +hostname: "s86-t214-tg1" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.86" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk22.03" +intel_800_matrix: "dpdk22.03" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.87.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.87.yaml new file mode 100644 index 0000000000..a00eab9c26 --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.87.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.87.yaml + +hostname: "s87-t215-sut1" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.87" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk21.02" +intel_800_matrix: "dpdk21.02" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml new file mode 100644 index 0000000000..3ab76b6952 --- /dev/null +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml @@ -0,0 +1,33 @@ +--- +# file: host_vars/10.30.51.88.yaml + +hostname: "s88-t215-tg1" +grub: + audit: "0" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" + nmi_watchdog: "0" + nohz_full: "1-31,33-63,65-95,97-127" + nosoftlockup: true + numa_balancing: "disable" + processor.max_cstate: "1" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" +sysctl: + kernel: + watchdog_cpumask: "0,32,64,96" + vm: + nr_hugepages: 32768 + max_map_count: 20000 + +inventory_ipmi_hostname: "10.30.50.88" +cpu_microarchitecture: "icelake" + +intel_700_matrix: "dpdk22.03" +intel_800_matrix: "dpdk22.03" diff --git a/fdio.infra.ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts index a31a3754ea..413a8fb740 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/hosts +++ b/fdio.infra.ansible/inventories/lf_inventory/hosts @@ -10,7 +10,11 @@ all: 10.30.51.60: #s16-t32-tg1 - skylake 10.30.51.74: #s64-t34-tg1 - icelake 10.30.51.77: #s67-t37-tg1 - icelake + 10.30.51.80: #s80-t38-tg1 - icelake 10.30.51.82: #s72-t212-tg1 - icelake + 10.30.51.84: #s84-t213-tg1 - icelake + 10.30.51.86: #s86-t214-tg1 - icelake + 10.30.51.88: #s88-t215-tg1 - icelake 10.32.8.10: #s28-t26t35-tg1 - skylake 10.32.8.19: #s34-t27-tg1 - cascadelake 10.32.8.21: #s36-t28-tg1 - cascadelake @@ -31,7 +35,12 @@ all: 10.30.51.73: #s63-t34-sut2 - altra 10.30.51.75: #s65-t37-sut1 - icelake 10.30.51.76: #s66-t37-sut2 - icelake + 10.30.51.78: #s78-t38-sut1 - icelake + 10.30.51.79: #s79-t38-sut2 - icelake 10.30.51.81: #s71-t212-sut1 - icelake + 10.30.51.83: #s83-t213-sut1 - icelake + 10.30.51.85: #s85-t214-sut1 - icelake + 10.30.51.87: #s87-t215-sut1 - icelake 10.32.8.11: #s29-t26-sut1 - denverton 10.32.8.12: #s30-t35-sut1 - denverton 10.32.8.13: #s31-t35-sut2 - denverton diff --git a/fdio.infra.ansible/roles/intel/tasks/ice.yaml b/fdio.infra.ansible/roles/intel/tasks/ice.yaml index bbd07c6539..2386c8390c 100644 --- a/fdio.infra.ansible/roles/intel/tasks/ice.yaml +++ b/fdio.infra.ansible/roles/intel/tasks/ice.yaml @@ -54,15 +54,15 @@ tags: - intel-inst -- name: Inst - Extract Dynamic Device Personalization (DDP) Package - unarchive: - remote_src: true - src: "{{ intel_extract_dir }}/ice_comms-{{ ddp }}.zip" - dest: "{{ intel_extract_dir }}/" - register: intel_driver_extracted - tags: - - intel-inst - +#- name: Inst - Extract Dynamic Device Personalization (DDP) Package +# unarchive: +# remote_src: true +# src: "{{ intel_extract_dir }}/ice_comms-{{ ddp }}.zip" +# dest: "{{ intel_extract_dir }}/" +# register: intel_driver_extracted +# tags: +# - intel-inst +# - name: Inst - Copy Dynamic Device Personalization (DDP) Package copy: src: "{{ intel_extract_dir }}/ice_comms-{{ ddp }}.pkg" diff --git a/fdio.infra.ansible/roles/intel/tasks/main.yaml b/fdio.infra.ansible/roles/intel/tasks/main.yaml index c37a373db6..cb81020a68 100644 --- a/fdio.infra.ansible/roles/intel/tasks/main.yaml +++ b/fdio.infra.ansible/roles/intel/tasks/main.yaml @@ -18,7 +18,7 @@ - intel-inst-drivers - name: Inst - Check Presence of Intel Ethernet 700 Series - shell: "lspci -d 8086:1583; lspci -d 8086:1585; lspci -d 8086:1572" + shell: "lspci -d 8086:1583; lspci -d 8086:1585; lspci -d 8086:1572; lspci -d 8086:158a; lspci -d 8086:158b" register: intel_700_pcis failed_when: false changed_when: false diff --git a/fdio.infra.ansible/roles/mellanox/tasks/main.yaml b/fdio.infra.ansible/roles/mellanox/tasks/main.yaml index 75964304ca..81fefc8ae3 100644 --- a/fdio.infra.ansible/roles/mellanox/tasks/main.yaml +++ b/fdio.infra.ansible/roles/mellanox/tasks/main.yaml @@ -29,7 +29,8 @@ set_fact: ofed: "{{ mellanox_cx5_compatibility_matrix[mellanox_cx5_matrix]['ofed'] }}" when: > - mellanox_pcis is defined + mellanox_pcis.stdout_lines | length > 0 and + mellanox_cx5_matrix is defined tags: - mellanox-inst-drivers -- 2.16.6