From 0487610a28befb172a8168d8aa4c858ec02e014c Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Sat, 13 Jun 2026 18:53:17 +0200 Subject: [PATCH 1/2] Fix paths to EPEL repositories Our EPEL repository file was building paths using variable $releasever, i.e. `10`. This now maps to `/pub/epel/10.3` which contains packages that may not be compatible with Rocky Linux 10.2. Change paths to use the minor version when defined (it is undefined on CentOS Stream). This will produce paths such as `/pub/epel/10.2` on Rocky Linux 10.2. We could also use `/pub/epel/10z` to point to the latest stable release, but it returns a 404 error on download.fedoraproject.org. Closes-Bug: #2156407 Change-Id: I62c16b9d09607ab728068d64196b11ed83e03195 Signed-off-by: Pierre Riteau (cherry picked from commit b00b6cc804ab18b5b76d3463727e660d0badc856) --- ansible/roles/dnf/templates/epel.repo.j2 | 12 ++++++------ .../fix-epel-repo-paths-rocky-2ba695709fcc6f9c.yaml | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/fix-epel-repo-paths-rocky-2ba695709fcc6f9c.yaml diff --git a/ansible/roles/dnf/templates/epel.repo.j2 b/ansible/roles/dnf/templates/epel.repo.j2 index ad5d8c774..6c5efbafe 100644 --- a/ansible/roles/dnf/templates/epel.repo.j2 +++ b/ansible/roles/dnf/templates/epel.repo.j2 @@ -1,22 +1,22 @@ [epel] -name=Extra Packages for Enterprise Linux $releasever - $basearch -baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/$basearch +name=Extra Packages for Enterprise Linux $releasever${releasever_minor:+.$releasever_minor} - $basearch +baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever${releasever_minor:+.$releasever_minor}/Everything/$basearch enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }} fastestmirror=0 [epel-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/$basearch/debug +name=Extra Packages for Enterprise Linux $releasever${releasever_minor:+.$releasever_minor} - $basearch - Debug +baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever${releasever_minor:+.$releasever_minor}/Everything/$basearch/debug enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }} gpgcheck=1 fastestmirror=0 [epel-source] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/SRPMS +name=Extra Packages for Enterprise Linux $releasever${releasever_minor:+.$releasever_minor} - $basearch - Source +baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever${releasever_minor:+.$releasever_minor}/Everything/SRPMS enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }} gpgcheck=1 diff --git a/releasenotes/notes/fix-epel-repo-paths-rocky-2ba695709fcc6f9c.yaml b/releasenotes/notes/fix-epel-repo-paths-rocky-2ba695709fcc6f9c.yaml new file mode 100644 index 000000000..b0c07efe3 --- /dev/null +++ b/releasenotes/notes/fix-epel-repo-paths-rocky-2ba695709fcc6f9c.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + Fixes paths to EPEL repositories on Rocky Linux. Previously, they were only + using the major version ``$releasever`` which could point to an + incompatible repository. They now use both major and minor versions, e.g. + ``10.2`` instead of ``10``. There is no change on CentOS Stream which uses + only the major version. + `LP#2156407 `__ From be31e785f73894230c00c7d8798268e2690c8159 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 17 Jun 2026 18:27:11 +0200 Subject: [PATCH 2/2] Bump stackhpc.openstack to 0.10.2 This fixes a broken conditional causing IPA/overcloud image build failures. Closes-Bug: #2157021 Change-Id: I659e89efcad628187caccd83018d5068eb4a3bf7 Signed-off-by: Pierre Riteau (cherry picked from commit dd5eb04f59c832de4e583719d2611dc53217b251) --- .../bump-stackhpc-openstack-0.10.2-ffe12d4afea4aa56.yaml | 7 +++++++ requirements.yml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bump-stackhpc-openstack-0.10.2-ffe12d4afea4aa56.yaml diff --git a/releasenotes/notes/bump-stackhpc-openstack-0.10.2-ffe12d4afea4aa56.yaml b/releasenotes/notes/bump-stackhpc-openstack-0.10.2-ffe12d4afea4aa56.yaml new file mode 100644 index 000000000..87e8b1795 --- /dev/null +++ b/releasenotes/notes/bump-stackhpc-openstack-0.10.2-ffe12d4afea4aa56.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Bumps the ``stackhpc.openstack`` collection to version 0.10.2. This fixes a + broken conditional causing IPA and overcloud image build failures when + ``ALLOW_BROKEN_CONDITIONALS`` is disabled. + `LP#2157021 `__ diff --git a/requirements.yml b/requirements.yml index 6cdba6264..fdbbed2da 100644 --- a/requirements.yml +++ b/requirements.yml @@ -22,7 +22,7 @@ collections: - name: stackhpc.network version: 1.0.0 - name: stackhpc.openstack - version: 0.10.1 + version: 0.10.2 roles: - src: ahuffman.resolv