Skip to content

Commit

Permalink
fix #732 Drop Puppet 6 Support
Browse files Browse the repository at this point in the history
  • Loading branch information
lbetz committed Sep 1, 2023
1 parent 8446a16 commit 496d524
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 19 deletions.
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,12 @@ available in Icinga 2 can be enabled and configured with this module.

This module supports:

* [puppet] >= 4.10 < 8.0.0
* [puppet] >= 7.0.0 < 8.0.0

And depends on:

* [puppetlabs/stdlib] >= 5.0.0 < 8.0.0
* If Puppet 6 is used a stdlib 5.1 or higher is required, see https://github.com/Icinga/puppet-icinga2/issues/505
* [puppetlabs/concat] >= 2.1.0 < 8.0.0
* [puppetlabs/stdlib] >= 6.6.0 < 8.0.0
* [puppetlabs/concat] >= 6.4.0 < 8.0.0
* [icinga/icinga] >= 1.0.0 < 3.0.0
* needed if `manage_repos` is set to `true`
* [puppetlabs/chocolatey]
Expand All @@ -99,7 +98,7 @@ The use of Icinga's own CA is recommended. If you still want to use the Puppet c

This module has been tested on:

* Debian 10, 11
* Debian 10, 11, 12
* Ubuntu 20.04, 22.04
* CentOS/RHEL 7, 8, 9
* AlmaLinux/Rocky 8, 9
Expand Down
11 changes: 0 additions & 11 deletions manifests/globals.pp
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,5 @@
) {
assert_private()

if ( versioncmp($::facts['puppetversion'], '6' ) >= 0 and versioncmp(load_module_metadata('stdlib')['version'], '5.1.0') < 0 ) {
fail('You be affected by this bug: https://github.com/Icinga/puppet-icinga2/issues/505 so you should update your stdlib to version 5.1 or higher')
}

# Logon account on Windows
if $facts['os']['kernel'] == 'windows' {
if $logon_account and versioncmp($::facts['puppetversion'], '6.18.0') < 0 {
fail('Using logon_account requieres a Puppet version 6.18 or higher')
}
}

$constants = lookup('icinga2::globals::constants', Hash, 'deep', {})
}
6 changes: 3 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 5.0.0 < 9.0.0"
"version_requirement": ">= 6.6.0 < 9.0.0"
},
{
"name": "puppetlabs/concat",
"version_requirement": ">= 2.1.0 < 8.0.0"
"version_requirement": ">= 6.4.0 < 8.0.0"
}
],
"operatingsystem_support": [
Expand Down Expand Up @@ -106,7 +106,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 6.0.0 < 8.0.0"
"version_requirement": ">= 7.0.0 < 8.0.0"
}
],
"pdk-version": "2.5.0",
Expand Down

0 comments on commit 496d524

Please sign in to comment.