MODULES-633 - Fix for ip6tables

If the packages for ip6tables aren't installed, the provider will throw
an exception. Fix the provider to check to make sure the variable exists
first, and update params.pp to include the required package for EL6.

diff --git a/lib/puppet/provider/firewall/ip6tables.rb b/lib/puppet/provider/firewall/ip6tables.rb
index b5df9a7a4da7bfd99c4c332949808862cb82a441..2ed3c13da8c2ca516d5c73c54f89a04093011777 100644 (file)
--- a/lib/puppet/provider/firewall/ip6tables.rb
+++ b/lib/puppet/provider/firewall/ip6tables.rb
@@ -45,7 +45,8 @@ Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source =
 
 
   def initialize(*args)
-    if Facter.fact('ip6tables_version').value.match /1\.3\.\d/
+    ip6tables_version = Facter.value('ip6tables_version')
+    if ip6tables_version and ip6tables_version.match /1\.3\.\d/
       raise ArgumentError, 'The ip6tables provider is not supported on version 1.3 of iptables'
     else
       super

diff --git a/manifests/params.pp b/manifests/params.pp
index 4d66159bde928fa0271795b6c12e00f6789c33f7..9fa43a0c71f508c664b2df3562df5d1abcaaa875 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -22,7 +22,7 @@ class firewall::params {
           if versioncmp($::operatingsystemrelease, '7.0') >= 0 {
             $package_name = 'iptables-services'
           } else {
-            $package_name = undef
+            $package_name = 'iptables-ipv6'
           }
           $service_name = 'iptables'
         }