drop EOL OSes

theforeman · Mar 19, 2019 · 143199e · 143199e
1 parent 5ecda93
commit 143199e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git 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
@@ -72,15 +72,13 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04"
       ]
     },
     {
       "operatingsystem": "FreeBSD",
       "operatingsystemrelease": [
-        "10",
         "11",
         "12"
       ]

diff --git 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'