Skip to content

Commit 143199e

Browse files
committed
drop EOL OSes
1 parent 5ecda93 commit 143199e

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

manifests/params.pp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,7 @@
301301
case $::osfamily {
302302
'Debian' : {
303303
$agent_restart_command = "/usr/sbin/service ${service_name} reload"
304-
if ($::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0) {
305-
$unavailable_runmodes = []
306-
} else {
307-
$unavailable_runmodes = ['systemd.timer']
308-
}
304+
$unavailable_runmodes = []
309305
}
310306
'Redhat' : {
311307
# PSBM is a CentOS 6 based distribution

metadata.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,13 @@
7272
{
7373
"operatingsystem": "Ubuntu",
7474
"operatingsystemrelease": [
75-
"14.04",
7675
"16.04",
7776
"18.04"
7877
]
7978
},
8079
{
8180
"operatingsystem": "FreeBSD",
8281
"operatingsystemrelease": [
83-
"10",
8482
"11",
8583
"12"
8684
]

spec/spec_helper.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@
2222
when 'darwin'
2323
'launchd'
2424
when 'debian'
25-
if facts[:operatingsystem] == 'Ubuntu'
26-
facts[:operatingsystemmajrelease].to_i >= 15 ? 'systemd' : 'upstart'
27-
elsif facts[:operatingsystem] == 'Debian' && facts[:operatingsystemmajrelease].to_i >= 8
28-
'systemd'
29-
else
30-
'debian'
31-
end
25+
'systemd'
3226
when 'freebsd'
3327
'freebsd'
3428
when 'gentoo'

0 commit comments

Comments
 (0)