From 8aedac40dca26cb744946e711aeee6d11d1e1ca1 Mon Sep 17 00:00:00 2001
From: Louis Abel <tucklesepk@gmail.com>
Date: Tue, 5 Sep 2023 02:59:16 -0700
Subject: [PATCH] allow repo options to get around modularity rss issues

---
 templates/etc/yum.repos.d/rss.repo.j2 | 11 ++++--
 vars/rss.yml                          | 48 ++++++++++++++++-----------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/templates/etc/yum.repos.d/rss.repo.j2 b/templates/etc/yum.repos.d/rss.repo.j2
index 930dbd4..e949a48 100644
--- a/templates/etc/yum.repos.d/rss.repo.j2
+++ b/templates/etc/yum.repos.d/rss.repo.j2
@@ -2,10 +2,15 @@
 {% for repo in repo_tracking %}
 {% for arch in repo.arch %}
 {% for repository in repo.repositories %}
-[rl{{ repo.release }}-{{ arch }}-{{ repository }}]
-name=Rocky Linux {{ repo.release }} {{ arch }} {{ repository }}
-baseurl=https://dl.rockylinux.org/{{ repo.contentdir }}/{{ repo.release }}/{{ repository }}/{{ arch }}/os
+[rl{{ repo.release }}-{{ arch }}-{{ repository.name }}]
+name=Rocky Linux {{ repo.release }} {{ arch }} {{ repository.name }}
+baseurl=https://dl.rockylinux.org/{{ repo.contentdir }}/{{ repo.release }}/{{ repository.name }}/{{ arch }}/os
 enabled=0
+{% if 'repo_options' in repository %}
+{% for opt in repository.repo_options %}
+{{ opt }}
+{% endfor %}
+{% endif %}
 
 {% endfor %}
 {% endfor %}
diff --git a/vars/rss.yml b/vars/rss.yml
index 14ee488..b9afe86 100644
--- a/vars/rss.yml
+++ b/vars/rss.yml
@@ -8,15 +8,19 @@ repo_tracking:
       - x86_64
       - aarch64
     repositories:
-      - BaseOS
-      - AppStream
-      - PowerTools
-      - HighAvailability
-      - ResilientStorage
-      - RT
-      - NFV
-      - extras
-      - plus
+      - name: BaseOS
+      - name: AppStream
+        repo_options:
+          - module_hotfixes=1
+      - name: PowerTools
+        repo_options:
+          - module_hotfixes=1
+      - name: HighAvailability
+      - name: ResilientStorage
+      - name: RT
+      - name: NFV
+      - name: extras
+      - name: plus
   - release: 9
     contentdir: "pub/rocky"
     arch:
@@ -25,15 +29,19 @@ repo_tracking:
       - ppc64le
       - s390x
     repositories:
-      - BaseOS
-      - AppStream
-      - CRB
-      - HighAvailability
-      - ResilientStorage
-      - RT
-      - NFV
-      - SAP
-      - SAPHANA
-      - extras
-      - plus
+      - name: BaseOS
+      - name: AppStream
+        repo_options:
+          - module_hotfixes=1
+      - name: CRB
+        repo_options:
+          - module_hotfixes=1
+      - name: HighAvailability
+      - name: ResilientStorage
+      - name: RT
+      - name: NFV
+      - name: SAP
+      - name: SAPHANA
+      - name: extras
+      - name: plus
 ...