X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Faws%2Ftasks%2Fmain.yaml;h=2d209762c3ad52e15b5bacb21d1a1f3b3ba74b62;hp=deca0670ec47e30ce63b7244156d04abbf0ea716;hb=8018da98e0f362bc69fc9600fac222a86fd46b5e;hpb=a678231f39f4d4ea079018e7d11be36d0cc454d2

diff --git a/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml
index deca0670ec..2d209762c3 100644
--- a/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml
@@ -4,7 +4,7 @@
 - name: Edit repositories
   include_tasks: "{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml"
   tags:
-    - edit-repo
+    - aws-edit-repo
 
 - name: Get vfio-pci With WC Patcher
   get_url:
@@ -12,27 +12,35 @@
     dest: "/opt/get-vfio-with-wc.sh"
     mode: "744"
   tags:
-    - vfio-aws-patch
+    - aws-vfio-patch
 
 - name: Create vfio-pci Patch Directory
   file:
     path: "/opt/patches/"
     state: "directory"
   tags:
-    - vfio-aws-patch
+    - aws-vfio-patch
 
-- name: Get vfio-pci WC Patch
+- name: Get vfio-pci WC Patch >=4.10
   get_url:
     url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/patches/linux-4.10-vfio-wc.patch"
     dest: "/opt/patches/linux-4.10-vfio-wc.patch"
     mode: "744"
   tags:
-    - vfio-aws-patch
+    - aws-vfio-patch
+
+- name: Get vfio-pci WC Patch >=5.8
+  get_url:
+    url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/patches/linux-5.8-vfio-wc.patch"
+    dest: "/opt/patches/linux-5.8-vfio-wc.patch"
+    mode: "744"
+  tags:
+    - aws-vfio-patch
 
 - name: Compile vfio-pci With WC Patch
   shell: "/bin/bash /opt/get-vfio-with-wc.sh"
   tags:
-    - vfio-aws-patch
+    - aws-vfio-patch
 
 - name: Load Kernel Modules By Default
   lineinfile:
@@ -43,7 +51,7 @@
     - "vfio-pci"
     - "igb_uio"
   tags:
-    - load-kernel-modules
+    - aws-load-kernel-modules
 
 - name: Add Kernel Modules Options (igb_uio)
   lineinfile:
@@ -54,7 +62,7 @@
   with_items:
     - "options igb_uio wc_activate=1"
   tags:
-    - load-kernel-modules
+    - aws-load-kernel-modules
 
 - name: Add Kernel Modules Options (vfio-pci)
   lineinfile:
@@ -65,14 +73,14 @@
   with_items:
     - "options vfio enable_unsafe_noiommu_mode=1"
   tags:
-    - load-kernel-modules
+    - aws-load-kernel-modules
 
 - name: Reload systemd-modules
   systemd:
     name: "systemd-modules-load"
     state: "restarted"
   tags:
-    - reload-systemd-modules
+    - aws-reload-systemd-modules
 
 - name: Performance Tuning - Adjust nr_hugepages
   sysctl:
@@ -82,4 +90,4 @@
     sysctl_file: "/etc/sysctl.d/90-csit.conf"
     reload: "yes"
   tags:
-    - set-sysctl
+    - aws-set-hugepages