Drop EL7 support

Author: ekohl

README.md

@@ -12,6 +12,7 @@ Part of the Foreman installer: <https://github.com/theforeman/foreman-installer>
 
 | Module version | Proxy versions | Notes                                               |
 |----------------|----------------|-----------------------------------------------------|
+| 23.x           | 3.4 and newer  | See compatibility notes in its README for 3.1-3.3   |
 | 22.x           | 3.3 and newer  | See compatibility notes in its README for 3.1-3.3   |
 | 21.x           | 3.1 and 3.2    |                                                     |
 | 20.x           | 3.1 and 3.2    | See compatibility notes in its README for 2.3-3.0   |
@@ -26,6 +27,7 @@ Part of the Foreman installer: <https://github.com/theforeman/foreman-installer>
 | 2.x            | 1.5 - 1.10     |                                                     |
 | 1.x            | 1.4 and older  |                                                     |
 
+ * 23.x dropped EL7 support. 3.1 and newer work on EL8.
  * 22.x renamed foreman_proxy::plugin::remote_execution::ssh to foreman_proxy::plugin::remote_execution::script as the feature within the plugin has changed from SSH to Script.
  * 20.x started to register as a Smart Proxy host. This requires Foreman 3.1. When using an older Foreman, set `$register_in_foreman` to false. This does require manual registration then.
  * 18.x switched to running `smart_proxy_dynflow` as part of `foreman-proxy` service by default. On EL* distributions and Foreman < 2.5, `foreman_proxy::plugin::dynflow::external_core` needs to be explicitly set to `true`.

manifests/params.pp

@@ -5,11 +5,7 @@
 
   case $facts['os']['family'] {
     'RedHat': {
-      if versioncmp($facts['os']['release']['major'], '7') <= 0 {
-        $ruby_package_prefix = 'tfm-rubygem-'
-      } else {
-        $ruby_package_prefix = 'rubygem-'
-      }
+      $ruby_package_prefix = 'rubygem-'
       $plugin_prefix = "${ruby_package_prefix}smart_proxy_"
 
       $dir   = pick($foreman_proxy::globals::dir, '/usr/share/foreman-proxy')
@@ -25,26 +21,16 @@
       $keyfile  = '/etc/rndc.key'
       $nsupdate = 'bind-utils'
 
-      if versioncmp($facts['os']['release']['major'], '7') <= 0 {
-        $_tftp_syslinux_filenames = [
-          '/usr/share/syslinux/chain.c32',
-          '/usr/share/syslinux/mboot.c32',
-          '/usr/share/syslinux/menu.c32',
-          '/usr/share/syslinux/memdisk',
-          '/usr/share/syslinux/pxelinux.0',
-        ]
-      } else {
-        $_tftp_syslinux_filenames = [
-          '/usr/share/syslinux/chain.c32',
-          '/usr/share/syslinux/ldlinux.c32',
-          '/usr/share/syslinux/libcom32.c32',
-          '/usr/share/syslinux/libutil.c32',
-          '/usr/share/syslinux/mboot.c32',
-          '/usr/share/syslinux/menu.c32',
-          '/usr/share/syslinux/memdisk',
-          '/usr/share/syslinux/pxelinux.0',
-        ]
-      }
+      $_tftp_syslinux_filenames = [
+        '/usr/share/syslinux/chain.c32',
+        '/usr/share/syslinux/ldlinux.c32',
+        '/usr/share/syslinux/libcom32.c32',
+        '/usr/share/syslinux/libutil.c32',
+        '/usr/share/syslinux/mboot.c32',
+        '/usr/share/syslinux/menu.c32',
+        '/usr/share/syslinux/memdisk',
+        '/usr/share/syslinux/pxelinux.0',
+      ]
     }
     'Debian': {
       $ruby_package_prefix = 'ruby-'

metadata.json

@@ -61,23 +61,15 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [

spec/acceptance/journald_spec.rb

@@ -11,8 +11,7 @@
     it { is_expected.to be_installed }
   end
 
-  # Logging to the journal is broken on Docker with EL7
-  describe command('journalctl -u foreman-proxy'), unless: default[:hypervisor] == 'docker' && os[:family] == 'redhat' && os[:release] =~ /^7\./ do
+  describe command('journalctl -u foreman-proxy') do
     its(:stdout) { is_expected.to match(%r{WEBrick::HTTPServer#start}) }
   end
 end

spec/defines/foreman_proxy_plugin_spec.rb

@@ -11,8 +11,6 @@
         let(:package) do
           if facts[:osfamily] == 'Debian'
             'ruby-smart-proxy-myplugin'
-          elsif facts[:osfamily] == 'RedHat' && facts[:operatingsystemmajrelease] == '7'
-            'tfm-rubygem-smart_proxy_myplugin'
           else
             'rubygem-smart_proxy_myplugin'
           end

spec/spec_helper_acceptance.rb

@@ -1,6 +1,6 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-ENV['BEAKER_setfile'] ||= 'centos7-64{hostname=centos7-64.example.com}'
+ENV['BEAKER_setfile'] ||= 'centos7-64{hostname=centos8-64.example.com}'
 
 configure_beaker(modules: :fixtures) do |host|
   if fact_on(host, 'os.family') == 'RedHat'

spec/support/plugin.rb

@@ -2,7 +2,7 @@ def on_plugin_os
   supported_os = [
     {
       'operatingsystem' => 'RedHat',
-      'operatingsystemrelease' => ['7'],
+      'operatingsystemrelease' => ['8'],
     },
     {
       'operatingsystem' => 'Debian',