aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml8
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml6
-rw-r--r--fdio.infra.ansible/roles/docker_images/tasks/main.yaml12
-rw-r--r--fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j218
-rw-r--r--fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j222
-rw-r--r--fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf2
-rw-r--r--fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf2
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf2
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf2
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf2
29 files changed, 51 insertions, 139 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
index 81794519b3..8ac5bd019d 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
@@ -35,11 +35,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
index 1a269d627d..d130d39d94 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
@@ -35,12 +35,6 @@ intel_qat_matrix: true
docker_sut: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/dev/null"
target: "/etc/sysctl.d/80-vpp.conf"
- source: "/opt/boot/"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml
index 3dc853ad5d..9b8d4e6f5f 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml
@@ -36,11 +36,5 @@ intel_qat_matrix: true
docker_tg: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml
index 7d7fb29b05..068fc642c7 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml
@@ -35,12 +35,6 @@ intel_qat_matrix: true
docker_sut: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/dev/null"
target: "/etc/sysctl.d/80-vpp.conf"
- source: "/opt/boot/"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml
index 4cb3dd7c70..b29ccc6207 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml
@@ -35,11 +35,5 @@ intel_qat_matrix: true
docker_tg: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
index 55709c10ab..3983115506 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
@@ -37,12 +37,6 @@ docker_sut: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/dev/null"
target: "/etc/sysctl.d/80-vpp.conf"
- source: "/opt/boot/"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
index 3c149ad194..10a7369ffc 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
@@ -37,11 +37,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
index 1567d7e7ef..07c1d265b9 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
@@ -35,16 +35,12 @@ intel_qat_matrix: true
docker_sut: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/dev/null"
target: "/etc/sysctl.d/80-vpp.conf"
- source: "/opt/boot/"
target: "/opt/boot/"
+ - source: "/opt/dpdk-24.07/"
+ target: "/opt/dpdk-24.07/"
- source: "/usr/bin/iperf3"
target: "/usr/bin/iperf3"
- source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
index 133ea10ba5..9f824b51e8 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
@@ -35,11 +35,5 @@ intel_qat_matrix: true
docker_tg: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
index 5a8fe6e5fa..45837a6dbd 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
@@ -38,11 +38,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
index 062b90af88..bf2b17abb1 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
@@ -38,11 +38,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml
index 7b89421b1e..344108c41a 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml
@@ -33,11 +33,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml
index f1da8fedcd..e6b2f48b72 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml
@@ -34,11 +34,5 @@ intel_800_matrix: "dpdk24.07"
docker_tg: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml
index fa86f2f54b..c06ae26221 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml
@@ -37,11 +37,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
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
index 82891bab43..e0c84f4e6d 100644
--- 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
@@ -37,11 +37,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
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 b8a42b5b10..9f9eb9b89b 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
@@ -37,11 +37,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
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
index 099287b1cd..c743c08efc 100644
--- 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
@@ -37,11 +37,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
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
index 5baea522eb..ee03a4b33b 100644
--- 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
@@ -37,11 +37,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
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
index e3cb0e8715..300515cd1d 100644
--- 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
@@ -37,11 +37,5 @@ docker_tg: true
docker_volumes:
- source: "/usr/bin/ofed_info"
target: "/usr/bin/ofed_info"
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml
index fe11858803..0a356dfca8 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml
@@ -34,11 +34,5 @@ intel_800_matrix: "dpdk24.07"
docker_tg: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml
index 6b1291633c..3bd4664ac0 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml
@@ -33,11 +33,5 @@ intel_800_matrix: "dpdk24.07"
docker_tg: true
docker_volumes:
- - source: "/dev/hugepages"
- target: "/dev/hugepages"
- - source: "/dev/vfio"
- target: "/dev/vfio"
- - source: "/etc/sudoers"
- target: "/etc/sudoers"
- source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/roles/docker_images/tasks/main.yaml b/fdio.infra.ansible/roles/docker_images/tasks/main.yaml
index e6171a2b01..382c70b80a 100644
--- a/fdio.infra.ansible/roles/docker_images/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/docker_images/tasks/main.yaml
@@ -1,12 +1,12 @@
---
# file: tasks/main.yaml
-#- name: "Build Base Docker Images"
-# import_tasks: "base.yaml"
-# when: >
-# inventory_hostname in groups["sut"]
-# tags:
-# - docker-base
+- name: "Build Base Docker Images"
+ import_tasks: "base.yaml"
+ when: >
+ inventory_hostname in groups["sut"]
+ tags:
+ - docker-base
- name: "Docker Orchestration for TG"
import_tasks: "tg.yaml"
diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
index 810374527c..10532fcfde 100644
--- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
+++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
@@ -16,6 +16,15 @@ services:
restart: "always"
shm_size: "4G"
volumes:
+ - type: "bind"
+ source: "/dev/hugepages"
+ target: "/dev/hugepages"
+ - type: "bind"
+ source: "/dev/vfio"
+ target: "/dev/vfio"
+ - type: "bind"
+ source: "/etc/sudoers"
+ target: "/etc/sudoers"
{% for volume in docker_volumes %}
- type: "bind"
source: "{{ volume.source }}"
@@ -38,6 +47,15 @@ services:
restart: "always"
shm_size: "4G"
volumes:
+ - type: "bind"
+ source: "/dev/hugepages"
+ target: "/dev/hugepages"
+ - type: "bind"
+ source: "/dev/vfio"
+ target: "/dev/vfio"
+ - type: "bind"
+ source: "/etc/sudoers"
+ target: "/etc/sudoers"
{% for volume in docker_volumes %}
- type: "bind"
source: "{{ volume.source }}"
diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
index c4d53c90c2..9b03c65409 100644
--- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
+++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
@@ -17,8 +17,17 @@ services:
privileged: true
restart: "always"
shm_size: "4G"
-{% if docker_volumes is defined and docker_volumes|length > 0 %}
volumes:
+ - type: "bind"
+ source: "/dev/hugepages"
+ target: "/dev/hugepages"
+ - type: "bind"
+ source: "/dev/vfio"
+ target: "/dev/vfio"
+ - type: "bind"
+ source: "/etc/sudoers"
+ target: "/etc/sudoers"
+{% if docker_volumes is defined and docker_volumes|length > 0 %}
{% for volume in docker_volumes %}
- type: "bind"
source: "{{ volume.source }}"
@@ -43,8 +52,17 @@ services:
privileged: true
restart: "always"
shm_size: "4G"
-{% if docker_volumes is defined and docker_volumes|length > 0 %}
volumes:
+ - type: "bind"
+ source: "/dev/hugepages"
+ target: "/dev/hugepages"
+ - type: "bind"
+ source: "/dev/vfio"
+ target: "/dev/vfio"
+ - type: "bind"
+ source: "/etc/sudoers"
+ target: "/etc/sudoers"
+{% if docker_volumes is defined and docker_volumes|length > 0 %}
{% for volume in docker_volumes %}
- type: "bind"
source: "{{ volume.source }}"
diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf
index 7b054d5aa4..43002d1b8a 100644
--- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
variable "tg_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-04f5fbbd9880e691a"
+ default = "ami-06ea2ad776e2a8461"
}
variable "tg_associate_public_ip_address" {
diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf
index efdbe912e2..923ae7fb74 100644
--- a/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
variable "tg_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-04f5fbbd9880e691a"
+ default = "ami-06ea2ad776e2a8461"
}
variable "tg_associate_public_ip_address" {
diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf
index a498645df9..f85ae03dc2 100644
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
variable "tg_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-04f5fbbd9880e691a"
+ default = "ami-06ea2ad776e2a8461"
}
variable "tg_associate_public_ip_address" {
diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
index b901fca8d9..fea82b0a5c 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
@@ -50,7 +50,7 @@ variable "placement_group_strategy" {
variable "tg_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-0c18f927fc6ac6c52"
+ default = "ami-06ea2ad776e2a8461"
}
variable "tg_associate_public_ip_address" {
diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf
index 0cc9252c68..41fcedaaf2 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
variable "tg_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-04f5fbbd9880e691a"
+ default = "ami-06ea2ad776e2a8461"
}
variable "tg_associate_public_ip_address" {