X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=fdio.infra.ansible%2Froles%2Fdocker_images%2Ftemplates%2Fdocker-compose-sut.yaml.j2;fp=fdio.infra.ansible%2Froles%2Fdocker_images%2Ftemplates%2Fdocker-compose-sut.yaml.j2;h=b4713d85521fbd71d22f9bdca1b2526885a5df0d;hb=21679c19cc2c6b74c3fc4a53a0d6a22474646046;hp=79f0f71e58e38e1bd6c540c474cd938e7b15e5db;hpb=0efc3083ed2bacaf3445a50fae1679a5ae88d7d9;p=csit.git 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