Drop EoL CentOS 6 support

diff --git a/metadata.json b/metadata.json
index 057c811410e844a881ae3cc799b8616554d45038..466bb9e8724e889bebf9ded8aa38266bf7ab3ad8 100644 (file)
--- 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 eee01fa1dca734e25c91561c571a8076390212ac..326ed9fc32c778c49ab1b7f32513cd25558db752 100644 (file)
--- 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',