From e3ca958848fcc3027f10a71ea9f80e8088b96f4a Mon Sep 17 00:00:00 2001 From: James Pannacciulli Date: Mon, 14 Mar 2016 15:24:16 -0700 Subject: [PATCH] Add VirtuozzoLinux to the RedHat family --- lib/puppet/util/firewall.rb | 4 ++-- manifests/linux.pp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb index d094b4c..cdffaaf 100644 --- a/lib/puppet/util/firewall.rb +++ b/lib/puppet/util/firewall.rb @@ -150,7 +150,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' + when 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer', 'VirtuozzoLinux' 'RedHat' when 'Debian', 'Ubuntu' 'Debian' @@ -175,7 +175,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'].include?(Facter.value(:operatingsystem)) && Facter.value(:operatingsystemrelease).to_i >= 7 + if os_key == 'RedHat' && ['RedHat','CentOS','Scientific','SL','SLC','Ascendos','CloudLinux','PSBM','OracleLinux','OVS','OEL','XenServer','VirtuozzoLinux'].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 4769516..04b12f3 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -28,7 +28,8 @@ class firewall::linux ( case $::operatingsystem { 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', - 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer': { + 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer', + 'VirtuozzoLinux': { class { "${title}::redhat": ensure => $ensure, enable => $enable, -- 2.45.2