From 067d9f98ad2a88eacc7401cbd3fc3a6fb446de5b Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 9 Feb 2021 11:35:37 +0100 Subject: Drop EoL CentOS 6 support --- metadata.json | 3 --- spec/acceptance/ferm_spec.rb | 9 --------- 2 files changed, 12 deletions(-) diff --git a/metadata.json b/metadata.json index 057c811..466bb9e 100644 --- a/metadata.json +++ b/metadata.json @@ -29,14 +29,12 @@ { "operatingsystem": "CentOS", "operatingsystemrelease": [ - "6", "7" ] }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "6", "7" ] }, @@ -61,7 +59,6 @@ { "operatingsystem": "VirtuozzoLinux", "operatingsystemrelease": [ - "6", "7" ] } diff --git a/spec/acceptance/ferm_spec.rb b/spec/acceptance/ferm_spec.rb index eee01fa..326ed9f 100644 --- a/spec/acceptance/ferm_spec.rb +++ b/spec/acceptance/ferm_spec.rb @@ -5,13 +5,6 @@ os_release = fact('os.release.major') sut_os = "#{os_name}-#{os_release}" -manage_initfile = case sut_os - when 'CentOS-6' - true - else - false - end - iptables_output = case sut_os when 'Debian-10' [ @@ -43,7 +36,6 @@ basic_manifest = %( class { 'ferm': manage_service => true, manage_configfile => true, - manage_initfile => #{manage_initfile}, # CentOS-6 does not provide init script forward_policy => 'DROP', output_policy => 'ACCEPT', input_policy => 'DROP', @@ -166,7 +158,6 @@ describe 'ferm' do class { 'ferm': manage_service => true, manage_configfile => true, - manage_initfile => #{manage_initfile}, # CentOS-6 does not provide init script forward_policy => 'DROP', output_policy => 'ACCEPT', input_policy => 'DROP', -- cgit v1.2.3