Skip to content

Commit 5ec3de0

Browse files
committed
Add configuration for ELRepo 9
1 parent f968667 commit 5ec3de0

File tree

5 files changed

+37
-1
lines changed

5 files changed

+37
-1
lines changed

etc/kayobe/dnf.yml

+18-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
# This is done by default for hosts in the overcloud group via a group_vars
4949
# file.
5050
stackhpc_dnf_repos_8: "{{ dnf_custom_repos_el8 | combine(lookup('vars', 'dnf_custom_repos_' ~ ansible_facts.distribution | lower )) }}"
51-
stackhpc_dnf_repos_9: "{{ dnf_custom_repos_el9 | combine(dnf_custom_repos_rocky_9) }}"
51+
stackhpc_dnf_repos_9: "{{ dnf_custom_repos_el9 | combine(dnf_custom_repos_rocky_9) | combine(dnf_custom_repos_elrepo_9 if dnf_install_elrepo_9 | bool else {}) }}"
5252

5353
stackhpc_dnf_repos: "{{ stackhpc_dnf_repos_9 if os_release == '9' else stackhpc_dnf_repos_8 }}"
5454

@@ -135,6 +135,16 @@ dnf_custom_repos_el9:
135135
gpgkey: "{{ dnf_docker_gpg_key_url }}"
136136
gpgcheck: yes
137137

138+
# ELRepo 9
139+
dnf_custom_repos_elrepo_9:
140+
elrepo:
141+
baseurl: "{{ stackhpc_repo_elrepo_9_url }}"
142+
description: "ELRepo.org Community Enterprise Linux Repository - el9"
143+
enabled: "{{ dnf_enable_elrepo_9 | bool }}"
144+
file: elrepo
145+
gpgkey: https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
146+
gpgcheck: yes
147+
138148
# Rocky 9 specific repositories
139149
dnf_custom_repos_rocky_9:
140150
appstream:
@@ -165,6 +175,9 @@ dnf_custom_repos_rocky_9:
165175
# Whether to enable EPEL repositories. This affects RedHat-based systems only.
166176
dnf_enable_epel: "{{ dnf_install_epel | bool }}"
167177

178+
# Whether to enable the ELRepo repository. This affects RedHat-based, 9.x release systems only.
179+
dnf_enable_elrepo_9: "{{ dnf_install_elrepo_9 | bool }}"
180+
168181
# URL of EPEL GPG keys.
169182
dnf_epel_8_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"
170183
dnf_epel_9_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
@@ -175,6 +188,10 @@ rocky_9_gpg_key: "https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9"
175188
# systems only. Default value is 'false'.
176189
#dnf_install_epel:
177190

191+
# Whether to create a repo file for ELRepo. This affects RedHat-based
192+
# systems only.
193+
dnf_install_elrepo_9: false
194+
178195
# Whether to enable docker dnf repo in stackhpc_dnf_repos
179196
dnf_enable_docker: true
180197

etc/kayobe/pulp-repo-versions.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230811T005529
1919
stackhpc_pulp_repo_docker_version: 20230203T025251
2020
stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20230203T025251
2121
stackhpc_pulp_repo_epel_9_version: 20230302T031902
22+
stackhpc_pulp_repo_elrepo_9_version: 20230907T075311
2223
stackhpc_pulp_repo_epel_modular_version: 20220913T043117
2324
stackhpc_pulp_repo_epel_version: 20230206T150339
2425
stackhpc_pulp_repo_grafana_version: 20230418T141317

etc/kayobe/pulp.yml

+8
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,14 @@ stackhpc_pulp_rpm_repos:
460460
sync_policy: mirror_content_only
461461
required: "{{ stackhpc_pulp_sync_el_9 | bool }}"
462462

463+
# ELRepo 9 repository
464+
- name: ELRepo.org Community Enterprise Linux Repository - el9
465+
url: "{{ stackhpc_release_pulp_content_url }}/elrepo/elrepo/el9/x86_64/{{ stackhpc_pulp_repo_elrepo_9_version }}"
466+
distribution_name: elrepo-el9-x86_64-
467+
base_path: elrepo/elrepo/el9/x86_64/
468+
sync_policy: mirror_content_only
469+
required: "{{ stackhpc_pulp_sync_el_9 | bool }}"
470+
463471
# Third-party repositories
464472
- name: Docker CE for CentOS 9
465473
url: "{{ stackhpc_release_pulp_content_url }}/docker-ce/centos/9/x86_64/stable/{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/stackhpc.yml

+4
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,10 @@ stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_repo_distribution }
185185
stackhpc_repo_epel_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/epel/9/Everything/x86_64/{{ stackhpc_repo_epel_9_version }}"
186186
stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}"
187187

188+
# ELRepo 9
189+
stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/x86_64/{{ stackhpc_repo_elrepo_9_version }}"
190+
stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
191+
188192
###############################################################################
189193
# Sources
190194

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Provide ELRepo 9, which in turn provides packages to support be2net
5+
and mpt3sas hardware. Configuration of ELRepo 9 is disabled by default
6+
and may be enabled by setting `dnf_install_elrepo_9: true`.

0 commit comments

Comments
 (0)