Remove support for Puppet 6

... because Puppet 6 reached its EOL in February 2023.

Change-Id: Idce97a877fb6918c8995a74784763473ec627a16
This commit is contained in:
Takashi Kajinami 2023-08-09 16:33:22 +09:00
parent 2cf190f3f5
commit 5d06f6c5f4
4 changed files with 9 additions and 23 deletions

View File

@ -100,9 +100,10 @@ class openstack_extras::repo::redhat::redhat (
$rdo_hash = {
'rdo-release' => {
'baseurl' => $rdo_baseurl,
'descr' => "OpenStack ${release_cap} Repository",
'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
'baseurl' => $rdo_baseurl,
'descr' => "OpenStack ${release_cap} Repository",
'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
'module_hotfixes' => true,
}
}
@ -114,15 +115,6 @@ class openstack_extras::repo::redhat::redhat (
create_resources('file', $rdokey_hash, $_gpgkey_defaults)
create_resources('yumrepo', $rdo_hash, $_repo_defaults)
# NOTE(tobias-urdin): This was introduced in yumrepo_core 1.0.7 which is
# included from 6.15.0 and forward (also since 7.0.0).
# TODO(tobias-urdin): Should set this by default when we only support Puppet 7.
if versioncmp($facts['puppetversion'], '6.15.0') >= 0 {
Yumrepo<| title == 'rdo-release' |> {
module_hotfixes => true,
}
}
}
if $manage_epel {

View File

@ -48,7 +48,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 6.0.0 < 8.0.0"
"version_requirement": ">= 7.0.0 < 8.0.0"
}
],
"source": "https://opendev.org/openstack/puppet-openstack_extras.git",

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Puppet 6 is no longer supported.

View File

@ -117,16 +117,6 @@ describe 'openstack_extras::repo::redhat::redhat' do
)}
end
context 'with default parameters but puppetversion < 6.15.0' do
before do
facts.merge!( :puppetversion => '6.14.0' )
end
it {
should contain_yumrepo('rdo-release').without_module_hotfixes
}
end
context 'with centos_mirror_url' do
let :params do
{