Skip to content

Commit e7e694f

Browse files
authored
Merge pull request voxpupuli#191 from saz/remove-powertools
remove unused powertools yum repo
2 parents f784656 + 128fc4d commit e7e694f

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

manifests/repo.pp

+1-17
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,12 @@
99
'RedHat': {
1010
unless $powerdns::custom_epel {
1111
include epel
12+
Class['epel'] -> Yumrepo['powerdns']
1213
}
1314

1415
Yumrepo['powerdns'] -> Package <| title == $powerdns::authoritative_package_name |>
1516
Yumrepo['powerdns-recursor'] -> Package <| title == $powerdns::recursor_package_name |>
1617

17-
if ($facts['os']['name'] == 'Rocky') {
18-
$mirrorlist = "https://mirrors.rockylinux.org/mirrorlist?arch=\$basearch&repo=PowerTools-\$releasever"
19-
$gpgkey = 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial'
20-
} else {
21-
$mirrorlist = "http://mirrorlist.centos.org/?release=\$releasever&arch=\$basearch&repo=PowerTools&infra=\$infra"
22-
$gpgkey = 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial'
23-
}
24-
25-
yumrepo { 'powertools':
26-
ensure => 'present',
27-
descr => 'PowerTools',
28-
mirrorlist => $mirrorlist,
29-
enabled => 'true',
30-
gpgkey => $gpgkey,
31-
gpgcheck => 'true',
32-
}
33-
3418
yumrepo { 'powerdns':
3519
name => 'powerdns',
3620
descr => "PowerDNS repository for PowerDNS Authoritative - version ${powerdns::authoritative_version}",

spec/classes/powerdns_init_spec.rb

-11
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,6 @@
108108
it { is_expected.to contain_class('powerdns::repo') }
109109
case facts[:osfamily]
110110
when 'RedHat'
111-
it { is_expected.to contain_yumrepo('powertools') }
112-
if facts[:operatingsystem] != 'Rocky'
113-
it {
114-
is_expected.to contain_yumrepo('powertools').with('mirrorlist' => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra')
115-
}
116-
end
117-
if facts[:operatingsystem] == 'Rocky'
118-
it {
119-
is_expected.to contain_yumrepo('powertools').with('mirrorlist' => 'https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever')
120-
}
121-
end
122111
it { is_expected.to contain_yumrepo('powerdns') }
123112
it { is_expected.to contain_yumrepo('powerdns').with('baseurl' => 'http://repo.powerdns.com/centos/$basearch/$releasever/auth-48') }
124113
it { is_expected.to contain_yumrepo('powerdns-recursor') }

0 commit comments

Comments
 (0)