Add Puppet 8 support

metadata.json

@@ -21,7 +21,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "operatingsystem_support": [

spec/acceptance/basic_spec.rb

@@ -6,6 +6,8 @@
   end
 
   specify do
-    expect(file('/etc/motd')).to have_attributes(content: /Foreman project/)
+    expect(file('/etc/motd')).to be_file
+      .and(have_attributes(content: /Foreman project/))
+      .and(have_attributes(content: /FQDN:\s+#{host_inventory['fqdn']}/))
   end
 end

spec/classes/init_spec.rb

@@ -1,19 +1,29 @@
 require 'spec_helper'
 
 describe 'motd' do
-  context 'default parameters' do
-    it { is_expected.to compile.with_all_deps }
-    it do
-      is_expected.to contain_file('/etc/motd')
-        .with_ensure('file')
-        .with_content(/property of the Foreman project/)
-    end
-  end
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let(:facts) { facts }
+
+      describe 'with default parameters' do
+        it { is_expected.to compile.with_all_deps }
 
-  context 'with ensure absent parameters' do
-    let(:params) { {ensure: 'absent'} }
+        it 'should contain a valid /etc/motd' do
+          is_expected.to contain_file('/etc/motd')
+            .with_ensure('file')
+            .with_content(/property of the Foreman project/)
+            .with_content(/FQDN:\s+#{facts['fqdn']}/)
+            .with_content(/Kernel:\s+#{facts['kernelrelease']}/)
+            .with_content(/Memory:\s#{facts['memorysize']}/)
+        end
+      end
 
-    it { is_expected.to compile.with_all_deps }
-    it { is_expected.to contain_file('/etc/motd').with_ensure('absent') }
+      describe 'with ensure absent parameters' do
+        let(:params) { {ensure: 'absent'} }
+
+        it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_file('/etc/motd').with_ensure('absent') }
+      end
+    end
   end
 end

templates/motd.erb

@@ -10,14 +10,12 @@ LOG OFF IMMEDIATELY if you do not agree to the conditions stated in this
 warning.
 *******************************************************************************
 
-<%= @operatingsystem %> <%= @operatingsystemrelease %> <%= @architecture %>
+<%= @facts['os']['name'] %> <%= @facts['os']['release']['full'] %> <%= @facts['os']['architecture'] %>
 
-FQDN:      <%= @fqdn %> (<%= @ipaddress %>)
-<% if has_variable?("processor0") then -%>
-Processor: <%= @processorcount %>x <%= @processor0 %>
-<% end -%>
-Kernel:    <%= @kernelrelease %>
-Memory:    <%= @memorysize %>
+FQDN:      <%= @facts['networking']['fqdn'] %> (<%= @facts['networking']['ipaddress'] %>)
+Processor: <%= @facts['processors']['count'] %>x <%= @facts['processors']['models'][0] %>
+Kernel:    <%= @facts['kernelrelease'] %>
+Memory:    <%= @facts['memory']['system']['total'] %>
 
 <% if has_variable?("owner") then -%>
 Owner: <%= @owner -%>