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/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/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 `__ 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