X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=fdio.infra.ansible%2Froles%2Fintel%2Ftasks%2Fmain.yaml;h=a73e6299a2a8ec1e29eb9a37b2e9a62d0f1df07f;hp=0d361a951dfcf0f910a34ab152e89ce5aed6335e;hb=93285a12d79b2b14f4e6dad9faf450a51149ca37;hpb=d5a815e56dc6a5aeb48b9bc9e063d4ecc167112d

diff --git a/fdio.infra.ansible/roles/intel/tasks/main.yaml b/fdio.infra.ansible/roles/intel/tasks/main.yaml
index 0d361a951d..a73e6299a2 100644
--- a/fdio.infra.ansible/roles/intel/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/intel/tasks/main.yaml
@@ -17,39 +17,65 @@
   tags:
     - intel-inst-drivers
 
-- name: Inst - Check Presence of Intel Ethernet 810 Series
-  shell: "lspci -d 8086:1592"
-  register: intel_e810_pcis
+- name: Inst - Check Presence of Intel Ethernet 700 Series
+  shell: "lspci -d 8086:1583; lspci -d 8086:1585; lspci -d 8086:1572"
+  register: intel_700_pcis
   failed_when: false
   changed_when: false
   tags:
     - intel-inst-drivers
 
-- name: Inst - Check Presence of Intel Ethernet 700 Series
-  shell: "lspci -d 8086:1583; lspci -d 8086:1585; lspci -d 8086:1572"
-  register: intel_700_pcis
+- name: Inst - Check Presence of Intel Ethernet 800 Series
+  shell: "lspci -d 8086:1592"
+  register: intel_800_pcis
   failed_when: false
   changed_when: false
   tags:
     - intel-inst-drivers
 
-- name: Inst - Driver Intel Ethernet 810 Series
-  import_tasks: ice.yaml
-  when:
-    - intel_e810_pcis.stdout_lines | length > 0
+- name: Inst - Get Intel Ethernet 700 Series driver versions
+  set_fact:
+    i40e: "{{ intel_700_compatibility_matrix[intel_700_matrix]['i40e'] }}"
+    iavf: "{{ intel_700_compatibility_matrix[intel_700_matrix]['iavf'] }}"
+    nvm: "{{ intel_700_compatibility_matrix[intel_700_matrix]['nvm'] }}"
+  when: >
+    intel_700_matrix is defined
   tags:
     - intel-inst-drivers
 
-# - name: Inst - Driver Intel Ethernet 700 Series
-#   import_tasks: i40e.yaml
-#   when:
-#     - intel_700_pcis.stdout_lines | length > 0
-#   tags:
-#     - intel-inst-drivers
+- name: Inst - Get Intel Ethernet 800 Series driver versions
+  set_fact:
+    ice: "{{ intel_800_compatibility_matrix[intel_800_matrix]['ice'] }}"
+    ddp: "{{ intel_800_compatibility_matrix[intel_800_matrix]['ddp'] }}"
+    iavf: "{{ intel_800_compatibility_matrix[intel_800_matrix]['iavf'] }}"
+    nvm: "{{ intel_800_compatibility_matrix[intel_800_matrix]['nvm'] }}"
+  when: >
+    intel_800_matrix is defined
+  tags:
+    - intel-inst-drivers
+
+- name: Inst - Driver Intel Ethernet 700 Series
+  import_tasks: i40e.yaml
+  when: >
+    intel_700_pcis.stdout_lines | length > 0 and
+    intel_700_matrix is defined
+  tags:
+    - intel-inst-drivers
+
+- name: Inst - Driver Intel Ethernet 800 Series
+  import_tasks: ice.yaml
+  when: >
+    intel_800_pcis.stdout_lines | length > 0 and
+    intel_800_matrix is defined
+  tags:
+    - intel-inst-drivers
 
-# - name: Inst - VF Driver Intel
-#   import_tasks: iavf.yaml
-#   when:
-#     - intel_700_pcis.stdout_lines | length > 0 or intel_e810_pcis.stdout_lines | length > 0
-#   tags:
-#     - intel-inst-drivers
+- name: Inst - Driver Intel iAVF
+  import_tasks: iavf.yaml
+  when: >
+    intel_700_pcis.stdout_lines | length > 0 or
+    intel_800_pcis.stdout_lines | length > 0 and
+    intel_700_matrix is defined or
+    intel_800_matrix is defined
+  tags:
+    - intel-inst-drivers