2 files changed, 16 insertions, 110 deletions
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 79f0f71e58..b4713d8552 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
@@ -15,36 +15,11 @@ services:
     restart: "always"
     shm_size: "4G"
     volumes:
+{% for volume in docker_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"
-      - type: "bind"
-        source: "/dev/null"
-        target: "/etc/sysctl.d/80-vpp.conf"
-      - type: "bind"
-        source: "/opt/boot/"
-        target: "/opt/boot/"
-      - type: "bind"
-        source: "/usr/bin/iperf3"
-        target: "/usr/bin/iperf3"
-      - type: "bind"
-        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
-        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
-      - type: "bind"
-        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
-        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
-      - type: "bind"
-        source: "/var/run/docker.sock"
-        target: "/var/run/docker.sock"
-      - type: "bind"
-        source: "/usr/lib/firmware/"
-        target: "/usr/lib/firmware/"
+        source: "{{ volume.source }}"
+        target: "{{ volume.target }}"
+{% endfor %}
   numa-1:
     build:
       context: "base/"
@@ -60,33 +35,8 @@ services:
     restart: "always"
     shm_size: "4G"
     volumes:
+{% for volume in docker_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"
-      - type: "bind"
-        source: "/dev/null"
-        target: "/etc/sysctl.d/80-vpp.conf"
-      - type: "bind"
-        source: "/opt/boot/"
-        target: "/opt/boot/"
-      - type: "bind"
-        source: "/usr/bin/iperf3"
-        target: "/usr/bin/iperf3"
-      - type: "bind"
-        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
-        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
-      - type: "bind"
-        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
-        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
-      - type: "bind"
-        source: "/var/run/docker.sock"
-        target: "/var/run/docker.sock"
-      - type: "bind"
-        source: "/usr/lib/firmware/"
-        target: "/usr/lib/firmware/"
-\ No newline at end of file
+        source: "{{ volume.source }}"
+        target: "{{ volume.target }}"
+{% endfor %}
+\ No newline at end of file
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 20ac905c5a..2cee85e169 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
@@ -13,33 +13,11 @@ services:
     restart: "always"
     shm_size: "4G"
     volumes:
+{% for volume in docker_volumes %}
       - type: "bind"
-        source: "/usr/bin/ofed_info"
-        target: "/usr/bin/ofed_info"
-      - type: "bind"
-        source: "/dev/hugepages"
-        target: "/dev/hugepages"
-      - type: "bind"
-        source: "/dev/vfio"
-        target: "/dev/vfio"
-      - type: "bind"
-        source: "/etc/sudoers"
-        target: "/etc/sudoers"
-      - type: "bind"
-        source: "/opt/"
-        target: "/opt/"
-      - type: "bind"
-        source: "/usr/bin/iperf3"
-        target: "/usr/bin/iperf3"
-      - type: "bind"
-        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
-        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
-      - type: "bind"
-        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
-        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
-      - type: "bind"
-        source: "/usr/lib/firmware/"
-        target: "/usr/lib/firmware/"
+        source: "{{ volume.source }}"
+        target: "{{ volume.target }}"
+{% endfor %}
   tg-1:
     build:
       context: "base/"
@@ -53,30 +31,8 @@ services:
     restart: "always"
     shm_size: "4G"
     volumes:
+{% for volume in docker_volumes %}
       - type: "bind"
-        source: "/usr/bin/ofed_info"
-        target: "/usr/bin/ofed_info"
-      - type: "bind"
-        source: "/dev/hugepages"
-        target: "/dev/hugepages"
-      - type: "bind"
-        source: "/dev/vfio"
-        target: "/dev/vfio"
-      - type: "bind"
-        source: "/etc/sudoers"
-        target: "/etc/sudoers"
-      - type: "bind"
-        source: "/opt/"
-        target: "/opt/"
-      - type: "bind"
-        source: "/usr/bin/iperf3"
-        target: "/usr/bin/iperf3"
-      - type: "bind"
-        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
-        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
-      - type: "bind"
-        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
-        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
-      - type: "bind"
-        source: "/usr/lib/firmware/"
-        target: "/usr/lib/firmware/"
+        source: "{{ volume.source }}"
+        target: "{{ volume.target }}"
+{% endfor %}
+\ No newline at end of file