Merge pull request #202 from bastelfreak/eol

Remove data for EoL operating systems
voxpupuli · Aug 6, 2024 · d0ad63e · d0ad63e
2 parents e0a0648 + eef915e
commit d0ad63e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 49 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -96,23 +96,7 @@
       $client_rpcbind_optname     = 'OPTIONS'
 
       case $facts['os']['distro']['codename'] {
-        'trusty': {
-          $client_services            = { 'rpcbind' => {} }
-          $client_nfsv4_services      = { 'rpcbind' => {}, 'nfs-common' => { require => Service['rpcbind'] } }
-          $client_gssd_service_name   = undef
-          $server_nfsv4_servicehelper = undef
-          $server_service_name        = 'nfs-kernel-server'
-          $client_gssdopt_name        = 'RPCGSSDOPTS'
-        }
-        'jessie', 'wheezy': {
-          $client_services            = { 'rpcbind' => {} }
-          $client_nfsv4_services      = { 'rpcbind' => {}, 'nfs-common' => { require => Service['rpcbind'] } }
-          $client_gssd_service_name   = undef
-          $server_nfsv4_servicehelper = ['nfs-common']
-          $server_service_name        = 'nfs-kernel-server'
-          $client_gssdopt_name        = 'RPCGSSDOPTS'
-        }
-        'bullseye', 'stretch', 'xenial', 'yakkety', 'zesty': {
+        'bullseye': {
           $client_services            = { 'rpcbind' => {
               ensure => 'running',
               enable => false,
@@ -132,7 +116,7 @@
           $server_service_name        = 'nfs-kernel-server'
           $client_gssdopt_name        = 'GSSDARGS'
         }
-        'bionic', 'focal', 'jammy', 'kinetic': {
+        'focal', 'jammy': {
           $client_services            = { 'rpcbind' => {} }
           $client_gssd_service_name   = { 'rpc-gssd' => {
               ensure => 'running',

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -6,41 +6,14 @@
   case fact('os.family')
 
   when 'Debian'
-    case fact('os.distro.codename')
-    when 'jessie', 'wheezy'
-      # server_service = 'nfs-kernel-server'
-      server_servicehelpers = %w[nfs-common]
-      client_services = %w[rpcbind nfs-common]
-    when 'trusty'
-      # server_service = 'nfs-kernel-server'
-      server_servicehelpers = ''
-      client_services = %w[rpcbind]
-    # when 'bionic', 'focal'
-    #   server_service = 'nfs-kernel-server'
-    #   server_servicehelpers = %w[nfs-idmapd]
-    #   client_services = %w[rpcbind]
-    else
-      # server_service = 'nfs-server'
-      server_servicehelpers = %w[nfs-idmapd]
-      client_services = %w[rpcbind]
-    end
+    server_servicehelpers = %w[nfs-idmapd]
+    client_services = %w[rpcbind]
     server_packages = %w[nfs-common nfs-kernel-server nfs4-acl-tools rpcbind]
     client_packages = %w[nfs-common nfs4-acl-tools rpcbind]
 
   when 'RedHat'
-    case fact('os.release.major').to_i
-    when 6
-      # server_service = 'nfs'
-      server_servicehelpers = %w[rpcidmapd rpcbind]
-      client_services = %w[rpcbind]
-    when 7
-      # server_service = 'nfs-server.service'
-      server_servicehelpers = %w[nfs-idmap.service]
-      client_services = %w[rpcbind.service rpcbind.socket]
-    else
-      server_servicehelpers = %w[nfs-idmapd.service]
-      client_services = %w[rpcbind.service rpcbind.socket]
-    end
+    server_servicehelpers = %w[nfs-idmapd.service]
+    client_services = %w[rpcbind.service rpcbind.socket]
     server_packages = %w[nfs-utils nfs4-acl-tools rpcbind]
     client_packages = %w[nfs-utils nfs4-acl-tools rpcbind]
   end