3 files changed, 24 insertions, 29 deletions
diff --git a/fdio.infra.ansible/roles/mellanox/defaults/main.yaml b/fdio.infra.ansible/roles/mellanox/defaults/main.yaml
index a12a613f74..de66be2d6b 100644
--- a/fdio.infra.ansible/roles/mellanox/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/mellanox/defaults/main.yaml
@@ -1,5 +1,5 @@
 ---
-# file: roles/mellanox/defaults/main.yaml
+# file: defaults/main.yaml
 
 packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}"
 
@@ -21,10 +21,10 @@ packages_by_arch:
 mellanox_download_url: "http://content.mellanox.com/ofed"
 mellanox_extract_dir: "/opt"
 
-mellanox_cx5_compatibility_matrix:
-  dpdk21.02:
-    # https://doc.dpdk.org/guides/rel_notes/release_21_02.html
-    ofed: "5.3-1.0.5.0"
-  dpdk22.03:
-    # https://doc.dpdk.org/guides/rel_notes/release_22_03.html
-    ofed: "5.5-1.0.3.2"
+mellanox_compatibility_matrix:
+  dpdk22.07:
+    # https://doc.dpdk.org/guides/rel_notes/release_22_07.html
+    ofed: "5.9-0.5.6.0"
+  dpdk23.11:
+    # https://doc.dpdk.org/guides/rel_notes/release_23_11.html
+    ofed: "23.07-0.5.0.0"
diff --git a/fdio.infra.ansible/roles/mellanox/tasks/main.yaml b/fdio.infra.ansible/roles/mellanox/tasks/main.yaml
index 81fefc8ae3..53376eb997 100644
--- a/fdio.infra.ansible/roles/mellanox/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/mellanox/tasks/main.yaml
@@ -1,5 +1,5 @@
 ---
-# file: roles/mellanox/tasks/main.yaml
+# file: tasks/main.yaml
 
 - name: Inst - Update Package Cache (APT)
   apt:
@@ -13,11 +13,11 @@
 - name: Inst - Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
-    state: latest
+    state: "latest"
   tags:
     - mellanox-inst-drivers
 
-- name: Inst - Check Presence of Mellanox CX-5
+- name: Inst - Check Presence of Mellanox
   shell: "lspci | grep Mellanox | awk '{print $1}'"
   register: mellanox_pcis
   failed_when: false
@@ -25,19 +25,19 @@
   tags:
     - mellanox-inst-drivers
 
-- name: Inst - Get Mellanox CX-5 OFED driver versions
+- name: Inst - Get Mellanox OFED driver versions
   set_fact:
-    ofed: "{{ mellanox_cx5_compatibility_matrix[mellanox_cx5_matrix]['ofed'] }}"
+    ofed: "{{ mellanox_compatibility_matrix[mellanox_matrix]['ofed'] }}"
   when: >
     mellanox_pcis.stdout_lines | length > 0 and
-    mellanox_cx5_matrix is defined
+    mellanox_matrix is defined
   tags:
     - mellanox-inst-drivers
 
-- name: Inst - Driver Mellanox CX-5
+- name: Inst - Driver Mellanox
   import_tasks: ofed.yaml
   when: >
     mellanox_pcis.stdout_lines | length > 0 and
-    mellanox_cx5_matrix is defined
+    mellanox_matrix is defined
   tags:
     - mellanox-inst-drivers
diff --git a/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml b/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
index 2ad40b0afb..c39975bab6 100644
--- a/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
+++ b/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
@@ -1,8 +1,8 @@
 ---
-# file: roles/mellanox/tasks/ofed.yaml
+# file: tasks/ofed.yaml
 
 - name: Inst - Get OFED
-  get_url:
+  ansible.builtin.get_url:
     url: "{{ mellanox_download_url }}/MLNX_OFED-{{ ofed }}/MLNX_OFED_LINUX-{{ ofed }}-{{ ansible_distribution|lower }}{{ ansible_distribution_version }}-{{ ansible_machine }}.tgz"
     dest: "{{ mellanox_extract_dir }}/MLNX_OFED_LINUX-{{ ofed }}-{{ ansible_distribution|lower }}{{ ansible_distribution_version }}-{{ ansible_machine }}.tgz"
     mode: "0644"
@@ -11,7 +11,7 @@
     - mellanox-inst-drivers
 
 - name: Inst - Extract OFED
-  unarchive:
+  ansible.builtin.unarchive:
     remote_src: true
     src: "{{ mellanox_extract_dir }}/MLNX_OFED_LINUX-{{ ofed }}-{{ ansible_distribution|lower }}{{ ansible_distribution_version }}-{{ ansible_machine }}.tgz"
     dest: "{{ mellanox_extract_dir }}/"
@@ -21,7 +21,7 @@
     - mellanox-inst-drivers
 
 - name: Inst - OFED
-  command: "./mlnxofedinstall --with-mft --dpdk --force --upstream-libs --without-fw-update"
+  ansible.builtin.command: "./mlnxofedinstall --with-mft --dpdk --force --upstream-libs" # --without-fw-update"
   args:
     chdir: "{{ mellanox_extract_dir }}/MLNX_OFED_LINUX-{{ ofed }}-{{ ansible_distribution|lower }}{{ ansible_distribution_version }}-{{ ansible_machine }}"
   when: mellanox_firmware_extracted
@@ -29,14 +29,9 @@
     - mellanox-inst-drivers
 
 - name: Inst - Switch Infiniband to Ethernet
-  command: "mlxconfig --yes --dev {{ item }} set LINK_TYPE_P1=2 LINK_TYPE_P2=2"
+  ansible.builtin.command: "mlxconfig --yes --dev {{ item }} set LINK_TYPE_P1=2 LINK_TYPE_P2=2"
   with_items: "{{ mellanox_pcis.stdout_lines }}"
+  failed_when: false
+  changed_when: false
   tags:
-    - mellanox-inst-drivers
-
-- name: FIX qemu-system removal
-  package:
-    name: "qemu-system"
-    state: latest
-  tags:
-    - mellanox-inst-drivers
+    - mellanox-inst-drivers
+\ No newline at end of file