Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Puppet 5 and CentOS 6 Support #71

Merged
merged 1 commit into from
Mar 22, 2021
Merged

Drop Puppet 5 and CentOS 6 Support #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,5 @@
fixtures:
repositories:
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
yumrepo_core:
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
puppet_version: ">= 6.0.0"
augeas_core:
repo: https://github.com/puppetlabs/puppetlabs-augeas_core.git
puppet_version: ">= 6.0.0"
yumrepo_core: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core.git'
augeas_core: 'https://github.com/puppetlabs/puppetlabs-augeas_core.git'
1 change: 0 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
) {
# Is the package cron or systemd.timer based?
$periodic_method = $facts['os']['release']['major'] ? {
'6' => 'cron',
'7' => 'cron',
default => 'timer',
}
Expand Down
6 changes: 2 additions & 4 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,26 @@
"dependencies": [
{
"name": "puppetlabs-stdlib",
"version_requirement": ">= 4.13.1 < 7.0.0"
"version_requirement": ">= 4.13.1 < 8.0.0"
}
],
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 5.5.8 < 7.0.0"
"version_requirement": ">= 6.1.0 < 7.0.0"
}
],
"operatingsystem_support": [
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7",
"8"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7",
"8"
]
Expand Down
6 changes: 3 additions & 3 deletions spec/classes/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
it { is_expected.to contain_file('/etc/fetch-crl.conf').without_content(%r{cache_control_request}) }
it { is_expected.to contain_file('/etc/fetch-crl.conf').without_content(%r{noerrors}) }
case facts[:os]['release']['major']
when '6', '7'
when '7'
it { is_expected.to contain_augeas('randomise_cron').with_incl('/etc/cron.d/fetch-crl') }
it { is_expected.to contain_augeas('randomise_cron').with_changes([%r{set minute ([0-9]|[1-5][0-9])}, %r{set hour [0-5]-23/6}]) }
it { is_expected.to contain_service('fetch-crl-boot').with_ensure(false) }
Expand Down Expand Up @@ -54,7 +54,7 @@

it { is_expected.to contain_file('/etc/fetch-crl.conf').with_content(%r{^noerrors$}) }
case facts[:os]['release']['major']
when '6', '7'
when '7'
it { is_expected.to contain_augeas('randomise_cron').with_incl('/etc/cron.d/fetch-crl') }
it { is_expected.to contain_augeas('randomise_cron').with_changes([%r{set minute ([0-9]|[1-5][0-9])}, %r{set hour [0-5]-23/6}]) }
it { is_expected.to contain_service('fetch-crl-boot').with_ensure(true) }
Expand All @@ -81,7 +81,7 @@
it { is_expected.to contain_file('/etc/fetch-crl.conf').without_content(%r{^noerrors$}) }
it { is_expected.not_to contain_augeas('randomise_cron') }
case facts[:os]['release']['major']
when '6', '7'
when '7'
it { is_expected.not_to contain_service('fetch-crl.timer') }
else
it { is_expected.to contain_service('fetch-crl.timer').with_ensure(false) }
Expand Down