add more repos and cope with CRB/PowerTools oddness

Author: sjpb

ansible/roles/dnf_repos/tasks/set_repos.yml

@@ -13,9 +13,9 @@
   loop_control:
     label: "{{ repo_name }}[{{ repo_os }}]: {{ repo_values }}"
   vars:
-    repo_name: "{{ item.key }}"
     repo_os: "{{ ansible_distribution_version if ansible_distribution_version in item.value else ansible_distribution_major_version }}"
     repo_values: "{{ item.value[repo_os] }}"
+    repo_name: "{{ repo_values.repo_name | default(item.key) }}"
     repo_content_url: "{{ repo_values.pulp_content_url | default(dnf_repos_pulp_content_url) }}"
 
 - meta: end_here
@@ -25,6 +25,7 @@
   ansible.builtin.dnf:
     name: epel-release
 
+# TODO: FIXME
 - name: Use Pulp EPEL repo
   ansible.builtin.yum_repository:
     name: epel

environments/common/inventory/group_vars/all/timestamps.yml

@@ -2,9 +2,10 @@ dnf_repos_default:
   appstream:                          # yum_repository:name
     '8.10':                           # ansible_distribution_version or ansible_distribution_major_version
       repo_file: Rocky-AppStream      # yum_repository: file
+      # repo_name:                    # optional, override yum_repository:name
       pulp_path: rocky/8.10/AppStream/x86_64/os
       pulp_timestamp: 20250614T013846
-      # pulp_content_url:             # optional
+      # pulp_content_url:             # optional, dnf_repos_pulp_content_url
     '9.4':
       repo_file: rocky
       pulp_path: rocky/9.4/AppStream/x86_64/os
@@ -17,19 +18,23 @@ dnf_repos_default:
       repo_file: rocky
       pulp_path: rocky/9.6/AppStream/x86_64/os
       pulp_timestamp: 20250726T040613
-  # baseos:
-  #   '8.10':
-  #     path: rocky/8.10/BaseOS/x86_64/os
-  #     timestamp: 20250614T013846
-  #   '9.4':
-  #     path: rocky/9.4/BaseOS/x86_64/os
-  #     timestamp: 20241115T011711
-  #   '9.5':
-  #     path: rocky/9.5/BaseOS/x86_64/os
-  #     timestamp: 20250513T031844
-  #   '9.6':
-  #     path: rocky/9.6/BaseOS/x86_64/os
-  #     timestamp: 20250726T052250
+  baseos:
+    '8.10':
+      repo_file: Rocky-BaseOS
+      pulp_path: rocky/8.10/BaseOS/x86_64/os
+      pulp_timestamp: 20250614T013846
+    '9.4':
+      repo_file: rocky
+      pulp_path: rocky/9.4/BaseOS/x86_64/os
+      pulp_timestamp: 20241115T011711
+    '9.5':
+      repo_file: rocky
+      pulp_path: rocky/9.5/BaseOS/x86_64/os
+      pulp_timestamp: 20250513T031844
+    '9.6':
+      repo_file: rocky
+      pulp_path: rocky/9.6/BaseOS/x86_64/os
+      pulp_timestamp: 20250726T052250
   Ceph:
     '8':
       repo_file: ceph
@@ -39,57 +44,73 @@ dnf_repos_default:
       repo_file: ceph
       pulp_path: centos/9-stream/storage/x86_64/ceph-reef
       pulp_timestamp: 20250617T023108
-  # crb:
-  #   '8.10':
-  #     path: rocky/8.10/PowerTools/x86_64/os
-  #     timestamp: 20250614T013846
-  #   '9.4':
-  #     path: rocky/9.4/CRB/x86_64/os
-  #     timestamp: 20241115T003133
-  #   '9.5':
-  #     path: rocky/9.5/CRB/x86_64/os
-  #     timestamp: 20250514T014704
-  #   '9.6':
-  #     path: rocky/9.6/CRB/x86_64/os
-  #     timestamp: 20250726T040613
+  crb:
+    '8.10':
+      repo_name: powertools
+      repo_file: Rocky-PowerTools
+      pulp_path: rocky/8.10/PowerTools/x86_64/os
+      pulp_timestamp: 20250614T013846
+    '9.4':
+      repo_file: rocky
+      pulp_path: rocky/9.4/CRB/x86_64/os
+      pulp_timestamp: 20241115T003133
+    '9.5':
+      repo_file: rocky
+      pulp_path: rocky/9.5/CRB/x86_64/os
+      pulp_timestamp: 20250514T014704
+    '9.6':
+      repo_file: rocky
+      pulp_path: rocky/9.6/CRB/x86_64/os
+      pulp_timestamp: 20250726T040613
   # epel:
   #   '8':
   #     path: epel/8/Everything/x86_64
   #     timestamp: 20250615T234151
   #   '9':
   #     path: epel/9/Everything/x86_64
   #     timestamp: 20250729T235750
-  # extras:
-  #   '8.10':
-  #     path: rocky/8.10/extras/x86_64/os
-  #     timestamp: 20250510T032327
-  #   '9.4':
-  #     path: rocky/9.4/extras/x86_64/os
-  #     timestamp: 20241118T002802
-  #   '9.5':
-  #     path: rocky/9.5/extras/x86_64/os
-  #     timestamp: 20250506T032818
-  #   '9.6':
-  #     path: rocky/9.6/extras/x86_64/os
-  #     timestamp: 20250726T040613
-  # grafana:
-  #   '8':
-  #     path: grafana/oss/rpm
-  #     timestamp: 20250615T005738
-  #   '9':
-  #     path: grafana/oss/rpm
-  #     timestamp: 20250730T011314
-  # openhpc_base:
-  #   '8':
-  #     path: OpenHPC/2/EL_8
-  #     timestamp: 20241218T154614
-  #   '9':
-  #     path: OpenHPC/3/EL_9
-  #     timestamp: 20241218T154614
-  # openhpc_updates:
-  #   '8':
-  #     path: OpenHPC/2/updates/EL_8
-  #     timestamp: 20250512T003315
-  #   '9':
-  #     path: OpenHPC/3/updates/EL_9
-  #     timestamp: 20250510T003301
+  extras:
+    '8.10':
+      repo_file: Rocky-Extras
+      pulp_path: rocky/8.10/extras/x86_64/os
+      pulp_timestamp: 20250510T032327
+    '9.4':
+      repo_file: rocky-extras
+      pulp_path: rocky/9.4/extras/x86_64/os
+      pulp_timestamp: 20241118T002802
+    '9.5':
+      repo_file: rocky-extras
+      pulp_path: rocky/9.5/extras/x86_64/os
+      pulp_timestamp: 20250506T032818
+    '9.6':
+      repo_file: rocky-extras
+      pulp_path: rocky/9.6/extras/x86_64/os
+      pulp_timestamp: 20250726T040613
+  grafana:
+    '8':
+      repo_file: grafana
+      pulp_path: grafana/oss/rpm
+      timestamp: 20250615T005738
+    '9':
+      repo_file: grafana
+      pulp_path: grafana/oss/rpm
+      pulp_timestamp: 20250730T011314
+  # TODO: figure out how to break out openhpc repos out separately to allow for no-ohpc case
+  openhpc_base:
+    '8':
+      repo_file: OpenHPC
+      pulp_path: OpenHPC/2/EL_8
+      pulp_timestamp: 20241218T154614
+    '9':
+      repo_file: OpenHPC
+      pulp_path: OpenHPC/3/EL_9
+      pulp_timestamp: 20241218T154614
+  openhpc_updates:
+    '8':
+      repo_file: OpenHPC
+      pulp_path: OpenHPC/2/updates/EL_8
+      pulp_timestamp: 20250512T003315
+    '9':
+      repo_file: OpenHPC
+      pulp_path: OpenHPC/3/updates/EL_9
+      pulp_timestamp: 20250510T003301