From ed964d3554c2da4f0018412920a8bb0b79b61941 Mon Sep 17 00:00:00 2001 From: Patrik Holmqvist Date: Thu, 19 Dec 2024 10:30:11 +0100 Subject: [PATCH] Remove legacy config and update syntax for puppet8 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 7868ef21..47d3e11d 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -863,15 +863,9 @@ class konsulter { class nrpe { require apt class {'sunet::nagios': } - if ($::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04') { - class {'apt::backports': } - } package {'nagios-plugins-contrib': ensure => latest} - if ($::operatingsystem == 'Ubuntu' and $::operatingsystemrelease < '18.04') { - package {'nagios-plugins-extra': ensure => latest} - } - if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '22.04') >= 0 ){ + if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '22.04') >= 0 ){ $mem_w = '90' $mem_c = '95' } else {