From 8e02299daff64ca9ce15f3aa73bbfa434e9740b9 Mon Sep 17 00:00:00 2001 From: david22swan Date: Thu, 4 Aug 2022 11:28:41 +0100 Subject: [PATCH 1/2] (GH-cat-11) Certify Support for Ubuntu 22.04 --- metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index afc9b9e70..880a2f078 100644 --- a/metadata.json +++ b/metadata.json @@ -63,7 +63,8 @@ "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "18.04", - "20.04" + "20.04", + "22.04" ] }, { From da538b8f73e2356a2f153a5b211a4a5c4d1c4ed6 Mon Sep 17 00:00:00 2001 From: david22swan Date: Tue, 16 Aug 2022 13:03:18 +0100 Subject: [PATCH 2/2] Update code for ubuntu 22.04 --- lib/puppet/type/firewall.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb index adfc5c30c..6509c1c84 100644 --- a/lib/puppet/type/firewall.rb +++ b/lib/puppet/type/firewall.rb @@ -1874,8 +1874,8 @@ def should_to_s(value) PUPPETCODE newvalues(%r{^([0-9a-f]{2}[:]){5}([0-9a-f]{2})$}i) facter_os_name = Facter.value(:os)['name'].downcase - facter_os_release = Facter.value(:os)['release']['major'].to_i - if ['debian-11', 'sles-15'].include?("#{facter_os_name}-#{facter_os_release}") + facter_os_release = Facter.value(:os)['release']['major'] + if ['ubuntu-22.04', 'debian-11', 'sles-15'].include?("#{facter_os_name}-#{facter_os_release}") munge do |value| _value = value.downcase end