aboutsummaryrefslogtreecommitdiffstats
path: root/fdio.infra.ansible
diff options
context:
space:
mode:
authorJuraj Linkeš <juraj.linkes@pantheon.tech>2022-08-19 11:37:47 +0200
committerPeter Mikus <peter.mikus@protonmail.ch>2022-08-25 07:40:11 +0000
commitd3d391f17f4ecaa56554dd558fd929d26cadce64 (patch)
tree890f22a4ed41d0e47382d7f5be43a0f9b87479a6 /fdio.infra.ansible
parente90dbd33ddd4a795a13df1593cbd78b236af699c (diff)
feat(ansible): update 1n-tx2 config
Arm VPP Device requires newer drivers, otherwise we're frequently seeing a deadlock when running csit-initialize-vfs. We've observed server slowdown in VPP Device jobs in the past and testing revealed that disabling the cppc_cpufreq seemingly resolves the issue (there was no observed slowdown with a sample of 500 job runs). Also update Nomad config (server IPs). Change-Id: I484417f2cdb701239ca7517406147d0f2f7adde4 Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Diffstat (limited to 'fdio.infra.ansible')
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml20
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml20
-rw-r--r--fdio.infra.ansible/roles/vpp_device/tasks/main.yaml11
-rw-r--r--fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml23
4 files changed, 48 insertions, 26 deletions
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 66df09b8bf..05e27a1c7a 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
@@ -10,6 +10,8 @@ grub:
iommu.passthrough: "1"
cpu_microarchitecture: "thunderx2"
+intel_700_matrix: "dpdk22.07"
+
# User management.
users:
- username: localadmin
@@ -45,13 +47,13 @@ nomad_options:
driver.whitelist: "docker,raw_exec,exec"
nomad_service_mgr: "systemd"
nomad_retry_servers:
- - "10.32.8.15"
- - "10.32.8.16"
- - "10.32.8.17"
+ - "10.30.51.23"
+ - "10.30.51.24"
+ - "10.30.51.25"
nomad_servers:
- - "10.32.8.15:4647"
- - "10.32.8.16:4647"
- - "10.32.8.17:4647"
+ - "10.30.51.23:4647"
+ - "10.30.51.24:4647"
+ - "10.30.51.25:4647"
nomad_cpu_total_compute: "40000"
# Consul settigs.
@@ -64,9 +66,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
consul_node_name: "{{ hostname }}"
consul_node_role: "client"
consul_retry_servers:
- - "10.32.8.15"
- - "10.32.8.16"
- - "10.32.8.17"
+ - "10.30.51.23"
+ - "10.30.51.24"
+ - "10.30.51.25"
consul_service_mgr: "systemd"
# Docker settings.
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 9642b69efb..ab71f7f43b 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
@@ -10,6 +10,8 @@ grub:
iommu.passthrough: "1"
cpu_microarchitecture: "thunderx2"
+intel_700_matrix: "dpdk22.07"
+
# User management.
users:
- username: localadmin
@@ -45,13 +47,13 @@ nomad_options:
driver.whitelist: "docker,raw_exec,exec"
nomad_service_mgr: "systemd"
nomad_retry_servers:
- - "10.32.8.15"
- - "10.32.8.16"
- - "10.32.8.17"
+ - "10.30.51.23"
+ - "10.30.51.24"
+ - "10.30.51.25"
nomad_servers:
- - "10.32.8.15:4647"
- - "10.32.8.16:4647"
- - "10.32.8.17:4647"
+ - "10.30.51.23:4647"
+ - "10.30.51.24:4647"
+ - "10.30.51.25:4647"
nomad_cpu_total_compute: "40000"
# Consul settigs.
@@ -64,9 +66,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
consul_node_name: "{{ hostname }}"
consul_node_role: "client"
consul_retry_servers:
- - "10.32.8.15"
- - "10.32.8.16"
- - "10.32.8.17"
+ - "10.30.51.23"
+ - "10.30.51.24"
+ - "10.30.51.25"
consul_service_mgr: "systemd"
# Docker settings.
diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
index 418217aaac..ec20d2a3cd 100644
--- a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
@@ -1,17 +1,12 @@
---
# file: roles/vpp_device/tasks/main.yaml
-- name: Load Kernel Modules By Default
- lineinfile:
- path: "/etc/modules"
- state: "present"
- line: "{{ item }}"
- with_items:
- - "vfio-pci"
+- name: ThunderX2 Kernel Modules Config
+ import_tasks: thunderx2.yaml
when:
- cpu_microarchitecture == "thunderx2"
tags:
- - load-kernel-modules
+ - conf-kernel-modules
- name: Disable IPv6 Router Advertisement
sysctl:
diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml
new file mode 100644
index 0000000000..438095fc00
--- /dev/null
+++ b/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml
@@ -0,0 +1,23 @@
+---
+# file: roles/vpp_device/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