Skip to content

Commit 82900e7

Browse files
committed
Fix version of EPEL GPG key
This is only an issue when dnf_use_local_mirror is true. Closes-Bug: #2119921 Change-Id: I55e703dcf67e556dd97289a58b8720511b60355b Signed-off-by: Pierre Riteau <[email protected]> (cherry picked from commit d410992)
1 parent 6f83a17 commit 82900e7

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

ansible/roles/dnf/templates/epel.repo.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch
33
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/$basearch
44
enabled=1
55
gpgcheck=1
6-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
6+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
77
fastestmirror=0
88

99
[epel-debuginfo]
1010
name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
1111
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/$basearch/debug
1212
enabled=0
13-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
13+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
1414
gpgcheck=1
1515
fastestmirror=0
1616

1717
[epel-source]
1818
name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
1919
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/SRPMS
2020
enabled=0
21-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
21+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
2222
gpgcheck=1
2323
fastestmirror=0
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes wrong name of ``gpgkey`` used for EPEL repositories when
5+
``dnf_use_local_mirror`` is enabled.
6+
`LP#2119921 <https://bugs.launchpad.net/kayobe/+bug/2119921>`__

0 commit comments

Comments
 (0)