From 91da0c964591fb2cde810b4467696a8f5e350973 Mon Sep 17 00:00:00 2001 From: Vadym Chepkov Date: Sat, 10 Jul 2021 18:46:53 -0400 Subject: [PATCH] add compatibility with Rocky Linux --- lib/puppet/util/firewall.rb | 4 ++-- manifests/linux.pp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb index a0616b4..06c64c0 100644 --- a/lib/puppet/util/firewall.rb +++ b/lib/puppet/util/firewall.rb @@ -172,7 +172,7 @@ module Puppet::Util::Firewall # Basic normalisation for older Facter os_key = Facter.value(:osfamily) os_key ||= case Facter.value(:operatingsystem) - when 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer', 'VirtuozzoLinux' + when 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer', 'VirtuozzoLinux', 'Rocky' 'RedHat' when 'Debian', 'Ubuntu' 'Debian' @@ -198,7 +198,7 @@ module Puppet::Util::Firewall end # RHEL 7 and newer also use systemd to persist iptable rules - if os_key == 'RedHat' && ['RedHat', 'CentOS', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'XenServer', 'VirtuozzoLinux'] + if os_key == 'RedHat' && ['RedHat', 'CentOS', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'XenServer', 'VirtuozzoLinux', 'Rocky'] .include?(Facter.value(:operatingsystem)) && Facter.value(:operatingsystemrelease).to_i >= 7 os_key = 'Fedora' end diff --git a/manifests/linux.pp b/manifests/linux.pp index 1067e5c..ff98400 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -57,7 +57,7 @@ class firewall::linux ( case $::operatingsystem { 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer', - 'VirtuozzoLinux': { + 'VirtuozzoLinux', 'Rocky': { class { "${title}::redhat": ensure => $ensure, ensure_v6 => $_ensure_v6, -- 2.45.2