From 23ddc8237cf1a8e633d3eebdf16e9af29f3c1842 Mon Sep 17 00:00:00 2001
From: Steve Brasier <steveb@stackhpc.com>
Date: Tue, 27 Feb 2024 12:18:45 +0000
Subject: [PATCH] Fix EPEL not getting installed

---
 defaults/main.yml      | 3 +++
 tasks/install-ohpc.yml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 6531601..c3bc31e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -112,6 +112,9 @@ ohpc_default_extra_repos:
       gpgcheck: true
       gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"
 
+# Concatenate extra repo definitions here
+ohpc_extra_repos: "{{ ohpc_default_extra_repos[ansible_distribution_major_version] + openhpc_extra_repos }}"
+
 openhpc_munge_key:
 openhpc_login_only_nodes: ''
 openhpc_module_system_install: true # only works for install-ohpc.yml/main.yml
diff --git a/tasks/install-ohpc.yml b/tasks/install-ohpc.yml
index 5993429..3cd56cd 100644
--- a/tasks/install-ohpc.yml
+++ b/tasks/install-ohpc.yml
@@ -10,7 +10,7 @@
 
 - name: Ensure extra repos
   ansible.builtin.yum_repository: "{{ item }}" # noqa: args[module]
-  loop: "{{ openhpc_extra_repos }}"
+  loop: "{{ ohpc_extra_repos }}" # NB this gets required ones for OpenHPC too
   loop_control:
     label: "{{ item.name }}"