Skip to content

Add configuration for ELRepo 9 #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Add configuration for ELRepo 9 #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ec3de0
Add configuration for ELRepo 9
m-bull Sep 7, 2023
aab631c
Merge branch 'stackhpc/yoga' into feat/yoga-elrepo-9
m-bull Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion etc/kayobe/dnf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# This is done by default for hosts in the overcloud group via a group_vars
# file.
stackhpc_dnf_repos_8: "{{ dnf_custom_repos_el8 | combine(lookup('vars', 'dnf_custom_repos_' ~ ansible_facts.distribution | lower )) }}"
stackhpc_dnf_repos_9: "{{ dnf_custom_repos_el9 | combine(dnf_custom_repos_rocky_9) }}"
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 {}) }}"

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

Expand Down Expand Up @@ -135,6 +135,16 @@ dnf_custom_repos_el9:
gpgkey: "{{ dnf_docker_gpg_key_url }}"
gpgcheck: yes

# ELRepo 9
dnf_custom_repos_elrepo_9:
elrepo:
baseurl: "{{ stackhpc_repo_elrepo_9_url }}"
description: "ELRepo.org Community Enterprise Linux Repository - el9"
enabled: "{{ dnf_enable_elrepo_9 | bool }}"
file: elrepo
gpgkey: https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
gpgcheck: yes

# Rocky 9 specific repositories
dnf_custom_repos_rocky_9:
appstream:
Expand Down Expand Up @@ -165,6 +175,9 @@ dnf_custom_repos_rocky_9:
# Whether to enable EPEL repositories. This affects RedHat-based systems only.
dnf_enable_epel: "{{ dnf_install_epel | bool }}"

# Whether to enable the ELRepo repository. This affects RedHat-based, 9.x release systems only.
dnf_enable_elrepo_9: "{{ dnf_install_elrepo_9 | bool }}"

# URL of EPEL GPG keys.
dnf_epel_8_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"
dnf_epel_9_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
Expand All @@ -175,6 +188,10 @@ rocky_9_gpg_key: "https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9"
# systems only. Default value is 'false'.
#dnf_install_epel:

# Whether to create a repo file for ELRepo. This affects RedHat-based
# systems only.
dnf_install_elrepo_9: false

# Whether to enable docker dnf repo in stackhpc_dnf_repos
dnf_enable_docker: true

Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/pulp-repo-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230811T005529
stackhpc_pulp_repo_docker_version: 20230203T025251
stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20230203T025251
stackhpc_pulp_repo_epel_9_version: 20230302T031902
stackhpc_pulp_repo_elrepo_9_version: 20230907T075311
stackhpc_pulp_repo_epel_modular_version: 20220913T043117
stackhpc_pulp_repo_epel_version: 20230206T150339
stackhpc_pulp_repo_grafana_version: 20230418T141317
Expand Down
8 changes: 8 additions & 0 deletions etc/kayobe/pulp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,14 @@ stackhpc_pulp_rpm_repos:
sync_policy: mirror_content_only
required: "{{ stackhpc_pulp_sync_el_9 | bool }}"

# ELRepo 9 repository
- name: ELRepo.org Community Enterprise Linux Repository - el9
url: "{{ stackhpc_release_pulp_content_url }}/elrepo/elrepo/el9/x86_64/{{ stackhpc_pulp_repo_elrepo_9_version }}"
distribution_name: elrepo-el9-x86_64-
base_path: elrepo/elrepo/el9/x86_64/
sync_policy: mirror_content_only
required: "{{ stackhpc_pulp_sync_el_9 | bool }}"

# Third-party repositories
- name: Docker CE for CentOS 9
url: "{{ stackhpc_release_pulp_content_url }}/docker-ce/centos/9/x86_64/stable/{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
Expand Down
4 changes: 4 additions & 0 deletions etc/kayobe/stackhpc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_repo_distribution }
stackhpc_repo_epel_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/epel/9/Everything/x86_64/{{ stackhpc_repo_epel_9_version }}"
stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}"

# ELRepo 9
stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/x86_64/{{ stackhpc_repo_elrepo_9_version }}"
stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"

###############################################################################
# Sources

Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/elrepo-9-9d88af1dea541155.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
features:
- |
Provide ELRepo 9, which in turn provides packages to support be2net
and mpt3sas hardware. Configuration of ELRepo 9 is disabled by default
and may be enabled by setting `dnf_install_elrepo_9: true`.