From b63d0889b407a499cfe80255c1aa39ab5b5ba700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Tue, 15 May 2018 12:59:46 +0200 Subject: [PATCH] dont depend on nagios-plugins-extra if ubuntu 18 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index bd81d438..53988d45 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -529,8 +529,9 @@ class nrpe { class {'apt::backports': } } package {'nagios-plugins-contrib': ensure => latest} - package {'nagios-plugins-extra': ensure => latest} - + if ($::operatingsystem == 'Ubuntu' and $::operatingsystemrelease < '18.04') { + package {'nagios-plugins-extra': ensure => latest} + } sunet::nagios::nrpe_command {'check_memory': command_line => '/usr/lib/nagios/plugins/check_memory -w 10% -c 5%' }