From 245e4ea908cae196d1b475e82a0a291e626d6c92 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 6 Aug 2024 11:17:05 +0200 Subject: [PATCH] Drop Debian 10 support Debian 10 is already EoL, so we should drop it. --- manifests/params.pp | 2 +- metadata.json | 1 - spec/classes/nfs_spec.rb | 32 +------------------------------- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index d9b187d..540362d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -112,7 +112,7 @@ $server_service_name = 'nfs-kernel-server' $client_gssdopt_name = 'RPCGSSDOPTS' } - 'bullseye', 'buster', 'stretch', 'xenial', 'yakkety', 'zesty': { + 'bullseye', 'stretch', 'xenial', 'yakkety', 'zesty': { $client_services = { 'rpcbind' => { ensure => 'running', enable => false, diff --git a/metadata.json b/metadata.json index 8126a0a..84f7d67 100644 --- a/metadata.json +++ b/metadata.json @@ -28,7 +28,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "10", "11" ] }, diff --git a/spec/classes/nfs_spec.rb b/spec/classes/nfs_spec.rb index 0926f7f..e8319a3 100644 --- a/spec/classes/nfs_spec.rb +++ b/spec/classes/nfs_spec.rb @@ -4,7 +4,7 @@ describe 'nfs' do # supported_os = %w[Ubuntu_default Ubuntu_16.04 Debian_default Debian_8 RedHat_default RedHat_7 RedHat_75 RedHat_8 Gentoo SLES Archlinux] - supported_os = %w[Ubuntu_20.04 Ubuntu_22.04 Debian_10 Debian_11 RedHat_default RedHat_7 RedHat_75 RedHat_8 Gentoo SLES] + supported_os = %w[Ubuntu_20.04 Ubuntu_22.04 Debian_11 RedHat_default RedHat_7 RedHat_75 RedHat_8 Gentoo SLES] supported_os.each do |os| context os do let(:default_facts) do @@ -265,36 +265,6 @@ client_rpcbind_config = '/etc/default/rpcbind' client_rpcbind_optname = 'OPTIONS' - when 'Debian_10' - - let(:facts) do - default_facts.merge( - 'operatingsystem' => 'Debian', - 'os' => { - 'family' => 'Debian', - 'distro' => { - 'codename' => 'buster' - }, - 'release' => { - 'major' => '10', - 'full' => '10' - } - } - ) - end - - server_service = 'nfs-kernel-server' - server_servicehelpers = %w[nfs-idmapd] - server_packages = %w[nfs-common nfs-kernel-server nfs4-acl-tools rpcbind] - client_services = %w[rpcbind] - client_nfs_vfour_services = %w[rpcbind] - client_packages = %w[nfs-common nfs4-acl-tools] - client_gssdopt_name = 'GSSDARGS' - defaults_file = '/etc/default/nfs-common' - idmapd_file = '/etc/idmapd.conf' - client_rpcbind_config = '/etc/default/rpcbind' - client_rpcbind_optname = 'OPTIONS' - when 'Debian_11' let(:facts) do