diff --git a/manifests/params.pp b/manifests/params.pp index 4a3af872..21c218c2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -301,11 +301,7 @@ case $::osfamily { 'Debian' : { $agent_restart_command = "/usr/sbin/service ${service_name} reload" - if ($::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0) { - $unavailable_runmodes = [] - } else { - $unavailable_runmodes = ['systemd.timer'] - } + $unavailable_runmodes = [] } 'Redhat' : { # PSBM is a CentOS 6 based distribution diff --git a/metadata.json b/metadata.json index 2be31b23..8df01a9e 100644 --- a/metadata.json +++ b/metadata.json @@ -72,7 +72,6 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "14.04", "16.04", "18.04" ] @@ -80,7 +79,6 @@ { "operatingsystem": "FreeBSD", "operatingsystemrelease": [ - "10", "11", "12" ] diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 876d4bd3..b94aad13 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -22,13 +22,7 @@ when 'darwin' 'launchd' when 'debian' - if facts[:operatingsystem] == 'Ubuntu' - facts[:operatingsystemmajrelease].to_i >= 15 ? 'systemd' : 'upstart' - elsif facts[:operatingsystem] == 'Debian' && facts[:operatingsystemmajrelease].to_i >= 8 - 'systemd' - else - 'debian' - end + 'systemd' when 'freebsd' 'freebsd' when 'gentoo'