22090 - Use list of RedHat OSes from newer facter.

diff --git a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb
index 99b9c573b8ff171c4cec5cbf9838fa18d024e825..13c1a89b113c2731440deee48952e6d876d44880 100644 (file)
--- a/lib/puppet/util/firewall.rb
+++ b/lib/puppet/util/firewall.rb
@@ -136,7 +136,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', 'SL', 'SLC'
+    when 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer'
       'RedHat'
     when 'Debian', 'Ubuntu'
       'Debian'

diff --git a/manifests/linux.pp b/manifests/linux.pp
index f8178f228f450007f85d51c41358ad9b0a2945ab..0e774567fb9670cd5070a28dff0ba546a79805b2 100644 (file)
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -24,7 +24,7 @@ class firewall::linux (
   }
 
   case $::operatingsystem {
-    'RedHat', 'CentOS', 'Fedora', 'SL', 'SLC': {
+    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer': {
       class { "${title}::redhat":
         ensure  => $ensure,
         enable  => $enable,