aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-03-15 19:36:40 +0000
committerpmikus <pmikus@cisco.com>2021-03-15 19:36:40 +0000
commiteb19fb2a7ce7c3a40e3a1a3042a15b0d728e4784 (patch)
tree2e59c2c25760053213219991a359acae4980b181 /resources
parenteb30e6b70823a30f35a1841ff996e2ead2cf0d08 (diff)
Infra: Ansible Ubuntu 20.04 follow-ups
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: I36a8b4a6cab976f51685df56c0dc2d95c00e248f
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml5
-rw-r--r--resources/tools/testbed-setup/ansible/roles/mellanox/defaults/main.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml6
-rw-r--r--resources/tools/testbed-setup/ansible/sut.yaml2
6 files changed, 9 insertions, 12 deletions
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
index 62ef6da2ce..a227893a16 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
@@ -1,7 +1,7 @@
---
# file: host_vars/10.30.51.49.yaml
-hostname: "s19-t33t34-tg1"
+hostname: "s19-t33t211-tg1"
grub:
audit: "0"
hpet: "disable"
@@ -26,4 +26,4 @@ sysctl:
max_map_count: 20000
inventory_ipmi_hostname: '10.30.50.46'
-cpu_microarchitecture: "skylake"
+cpu_microarchitecture: "skylake" \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
index 0ebda86285..264c62cf38 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
@@ -1,7 +1,7 @@
---
# file: host_vars/10.30.51.69.yaml
-hostname: "s27-t34-sut1"
+hostname: "s27-t211-sut1"
grub:
audit: "0"
intel_iommu: "on"
diff --git a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
index 7c2931ebec..43e40ebdf6 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
@@ -34,6 +34,7 @@ packages_by_distro:
- "python3-cffi-backend"
- "python3-dev"
- "python3-pip"
+ - "python3-pyelftools"
- "python3-setuptools"
focal:
- "build-essential"
@@ -45,6 +46,7 @@ packages_by_distro:
- "python3-cffi-backend"
- "python3-dev"
- "python3-pip"
+ - "python3-pyelftools"
- "python3-setuptools"
packages_by_arch:
@@ -67,5 +69,4 @@ packages_by_arch:
# ftp_proxy: http://proxy.com:80
# FTP_PROXY: http://proxy.com:80
# no_proxy: localhost,127.0.0.1,{{ ansible_default_ipv4.address }}
-# NO_PROXY: localhost,127.0.0.1,{{ ansible_default_ipv4.address }}
-
+# NO_PROXY: localhost,127.0.0.1,{{ ansible_default_ipv4.address }} \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/mellanox/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/mellanox/defaults/main.yaml
index a77bc67ec7..0961ec7df6 100644
--- a/resources/tools/testbed-setup/ansible/roles/mellanox/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/mellanox/defaults/main.yaml
@@ -18,4 +18,4 @@ packages_by_arch:
x86_64:
- []
-mellanox_version: "4.6-1.0.1.1"
+mellanox_version: "5.2-1.0.4.0" \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml
index 0fb7dd37a7..19bb15e9d3 100644
--- a/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml
@@ -40,7 +40,5 @@ packages_by_arch:
trex_target_dir: "/opt"
trex_url: "https://github.com/cisco-system-traffic-generator/trex-core/archive/"
trex_version:
- # rls2009
- - "2.82"
- # rls2101
- - "2.86"
+ # master // ubuntu 20.04
+ - "2.88" \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml
index abc25a279c..b449394090 100644
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/sut.yaml
@@ -28,8 +28,6 @@
tags: dpdk
- role: kernel_vm
tags: kernel_vm
- - role: csit_sut_image
- tags: csit_sut_image
- role: performance_tuning
tags: performance_tuning
- role: cleanup