rocky 10 additions

Author: owenjones

etc/kayobe/ansible/tools/push-ofed.yml

@@ -7,7 +7,7 @@
   tasks:
     - name: Get OFED module repo
       ansible.builtin.set_fact:
-        doca_modules_repos: "{{ stackhpc_pulp_rpm_repos | selectattr('name', 'search', 'OFED') | selectattr('base_path', 'search', '/' ~ kolla_base_arch ~ '/') | list }}"
+        doca_modules_repos: "{{ stackhpc_pulp_rpm_repos | selectattr('name', 'search', 'OFED') | selectattr('base_path', 'search', '/rhel' ~ os_release ~ '/') | selectattr('base_path', 'search', '/' ~ kolla_base_arch ~ '/') | list }}"
 
     - name: Assert OFED module repo is unique
       ansible.builtin.assert:

etc/kayobe/dnf.yml

@@ -75,23 +75,22 @@ dnf_custom_repos_doca_rocky_9:
 dnf_custom_repos_doca_rocky_10:
   doca:
     baseurl: "{{ stackhpc_repo_rhel10_doca_url }}"
-    description: "DOCA Online Repo {{ stackhpc_pulp_doca_version }} - RHEL $releasever"
+    description: "DOCA Online Repo 3.2.2 - RHEL $releasever"
     enabled: "{{ dnf_enable_doca | bool | default(false) }}"
     priority: -1
     file: doca
     gpgcheck: no
     username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
     password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
-    # TODO(owenjones): update this once repo for Rocky 10 has been created in Pulp
-    # doca-modules:
-    #   baseurl: "{{ stackhpc_repo_rhel9_doca_modules_url }}"
-    #   description: "OFED Kernel module repository for DOCA {{ stackhpc_pulp_doca_version }} - RHEL $releasever"
-    #   enabled: "{{ dnf_enable_doca_modules | bool | default(false) }}"
-    #   priority: -1
-    #   file: doca
-    #   gpgcheck: no
-    #   username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
-    #   password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
+  doca-modules:
+    baseurl: "{{ stackhpc_repo_rhel10_doca_modules_url }}"
+    description: "OFED Kernel module repository for DOCA 3.2.2 - RHEL $releasever"
+    enabled: "{{ dnf_enable_doca_modules | bool | default(false) }}"
+    priority: -1
+    file: doca
+    gpgcheck: no
+    username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
+    password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
 
 # Custom repositories shared between all RHEL 9/10 derivatives.
 dnf_custom_repos_el9:

etc/kayobe/ofed.yml

@@ -22,15 +22,23 @@ stackhpc_pulp_sync_ofed: "{{ groups['mlnx'] | length > 0 }}"
 # DOCA Snapshot lookup vars
 doca_rocky_9_minor_dot: "{% if stackhpc_pulp_doca_version is version('3.2.0', '>=') %}9{% else %}9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}{% endif %}"
 # eg stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version or stackhpc_pulp_repo_doca_3_2_2_rhel9_version
-doca_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel{{ doca_rocky_9_minor_dot | replace('.', '_') }}_version"
-doca_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_version"
-doca_modules_aarch64_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_aarch64_version"
+doca_rocky_9_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel{{ doca_rocky_9_minor_dot | replace('.', '_') }}_version"
+doca_rocky_9_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_version"
+doca_rocky_9_modules_aarch64_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_aarch64_version"
+
+doca_rocky_10_version_lookup_var: "stackhpc_pulp_repo_doca_3_2_2_rhel10_{{ kolla_base_arch }}_version"
+doca_rocky_10_modules_version_lookup_var: "stackhpc_pulp_repo_doca_3_2_2_rhel10_modules_version"
+doca_rocky_10_modules_aarch64_version_lookup_var: "stackhpc_pulp_repo_doca_3_2_2_rhel10_modules_aarch64_version"
 
 # DOCA Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml
-stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', doca_version_lookup_var) }}"
-stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', doca_modules_version_lookup_var) }}"
-stackhpc_pulp_repo_rhel9_doca_modules_aarch64_version: "{{ lookup('vars', doca_modules_aarch64_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', doca_rocky_9_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', doca_rocky_9_modules_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel9_doca_modules_aarch64_version: "{{ lookup('vars', doca_rocky_9_modules_aarch64_version_lookup_var) }}"
+
+stackhpc_pulp_repo_rhel10_doca_version: "{{ lookup('vars', doca_rocky_10_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel10_doca_modules_version: "{{ lookup('vars', doca_rocky_10_modules_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel10_doca_modules_aarch64_version: "{{ lookup('vars', doca_rocky_10_modules_aarch64_version_lookup_var) }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/pulp.yml

@@ -527,7 +527,7 @@ stackhpc_pulp_rpm_repos:
 
   - name: DOCA Online Repo 3.2.2 - RHEL 10
     url: "{{ stackhpc_release_pulp_content_url }}/doca/3.2.2/rhel10/x86_64/{{ stackhpc_pulp_repo_doca_3_2_2_rhel10_x86_64_version }}"
-    distribution_name: "doca-3.2.2-rhel10-"
+    distribution_name: "doca-3.2.2-rhel10-x86_64-"
     base_path: "doca/3.2.2/rhel10/x86_64/"
     required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
 
@@ -537,6 +537,18 @@ stackhpc_pulp_rpm_repos:
     base_path: "doca/3.2.2/rhel10/aarch64/"
     required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
 
+  - name: OFED Kernel modules for DOCA 3.2.2 - RHEL 10
+    url: "{{ stackhpc_release_pulp_content_url }}/doca-modules/3.2.2/rhel10/x86_64/{{ stackhpc_pulp_repo_rhel10_doca_modules_version }}"
+    distribution_name: "doca-modules-3.2.2-rhel10-"
+    base_path: "doca-modules/3.2.2/rhel10/x86_64/"
+    required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
+
+  - name: OFED Kernel modules for DOCA 3.2.2 - RHEL 10 aarch64
+    url: "{{ stackhpc_release_pulp_content_url }}/doca-modules/3.2.2/rhel10/aarch64/{{ stackhpc_pulp_repo_rhel10_doca_modules_aarch64_version }}"
+    distribution_name: "doca-modules-3.2.2-rhel10-aarch64-"
+    base_path: "doca-modules/3.2.2/rhel10/aarch64/"
+    required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
+
 # RPM repositories
 stackhpc_pulp_repository_rpm_repos: >-
   {%- set rpm_repos = [] -%}