Drop EL7 support

Author: bastelfreak

manifests/params.pp

@@ -300,10 +300,6 @@
         $agent_restart_command = "/usr/sbin/service ${service_name} reload"
         $unavailable_runmodes = ['systemd.timer']
       }
-      'RedHat': {
-        $agent_restart_command = "/sbin/service ${service_name} reload"
-        $unavailable_runmodes = ['systemd.timer']
-      }
       'Windows': {
         $agent_restart_command = undef
         $unavailable_runmodes = ['cron', 'systemd.timer']

manifests/server/puppetserver.pp

@@ -145,7 +145,7 @@
   Optional[Integer[1]] $max_open_files = $puppet::server::max_open_files,
   Optional[Stdlib::Absolutepath] $versioned_code_id = $puppet::server::versioned_code_id,
   Optional[Stdlib::Absolutepath] $versioned_code_content = $puppet::server::versioned_code_content,
-  Boolean $disable_fips = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] != '7',
+  Boolean $disable_fips = $facts['os']['family'] == 'RedHat',
   Array[String[1]] $jolokia_metrics_allowlist = $puppet::server::jolokia_metrics_allowlist,
 ) {
   include puppet::server
@@ -172,7 +172,6 @@
       'RedHat': {
         $facts['os']['release']['major'] ? {
           /^([89])$/ => '/usr/lib/jvm/jre-17/bin/java',
-          '7'        => '/usr/lib/jvm/jre-11/bin/java',
           default    => '/usr/bin/java'
         }
       }

metadata.json

@@ -42,15 +42,13 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
@@ -74,12 +72,6 @@
         "9"
       ]
     },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [

spec/acceptance/puppetserver_latest_spec.rb

@@ -25,7 +25,7 @@ class { 'puppet':
     end
   end
 
-  if ENV['BEAKER_PUPPET_COLLECTION'] != 'puppet7' && fact('os.family') == 'RedHat' && ['8', '9'].include?(fact('os.release.major'))
+  if ENV['BEAKER_PUPPET_COLLECTION'] != 'puppet7' && fact('os.family') == 'RedHat'
     describe 'JRE version' do
       it { expect(package('java-17-openjdk-headless')).to be_installed }
       it { expect(package('java-11-openjdk-headless')).not_to be_installed }

spec/classes/puppet_server_puppetserver_spec.rb

@@ -55,7 +55,7 @@
                      .with_incl('/etc/default/puppetserver')
                      .with_lens('Shellvars.lns')
           }
-          if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
+          if facts[:os]['family'] == 'RedHat'
             it {
               should contain_augeas('puppet::server::puppetserver::jvm')
                 .with_changes(['set JAVA_ARGS \'"-Xms2G -Xmx2G -Dcom.redhat.fips=false"\'', java_bin])
@@ -385,7 +385,7 @@
               .with_changes(['set puppetserver_java_opts \'"-Xms2G -Xmx2G -XX:foo=bar -XX:bar=foo"\''])
               .with_context('/files/etc/rc.conf')
           }
-        elsif facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
+        elsif facts[:os]['family'] == 'RedHat'
           it {
             should contain_augeas('puppet::server::puppetserver::jvm')
               .with_changes([
@@ -412,7 +412,7 @@
 
       describe 'with cli_args parameter', unless: facts[:osfamily] == 'FreeBSD' do
         let(:params) { super().merge(server_jvm_cli_args: '-Djava.io.tmpdir=/var/puppettmp') }
-        if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
+        if facts[:os]['family'] == 'RedHat'
           it {
             should contain_augeas('puppet::server::puppetserver::jvm')
               .with_changes([