From ab5fe2af78b1903d64aa48e9f5fcbcdbaa4994dd Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 8 Mar 2021 18:14:53 +0100
Subject: [PATCH] Support Puppet 7

---
 metadata.json                               | 2 +-
 spec/acceptance/puppetserver_latest_spec.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index dce64a31..ac572f58 100644
--- a/metadata.json
+++ b/metadata.json
@@ -35,7 +35,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.8 < 7.0.0"
+      "version_requirement": ">= 5.5.8 < 8.0.0"
     }
   ],
   "operatingsystem_support": [
diff --git a/spec/acceptance/puppetserver_latest_spec.rb b/spec/acceptance/puppetserver_latest_spec.rb
index 1a625022..0e28ddee 100644
--- a/spec/acceptance/puppetserver_latest_spec.rb
+++ b/spec/acceptance/puppetserver_latest_spec.rb
@@ -35,7 +35,9 @@ class { 'puppet':
         }
 
         # Puppet 5 + puppet/systemd 3 workaround
-        if $puppet::server_max_open_files and versioncmp($facts['puppetversion'], '6.1') < 0 {
+        # Also a possible systemd bug on Ubuntu 20.04
+        # https://github.com/theforeman/puppet-puppet/pull/779#issuecomment-886847275
+        if $puppet::server_max_open_files and (versioncmp($facts['puppetversion'], '6.1') < 0 or $facts['os']['name'] == 'Ubuntu' && $facts['os']['release']['major'] == '20.04') {
           exec { 'puppetserver-systemctl-daemon-reload':
             command     => 'systemctl daemon-reload',
             refreshonly => true,